feat: add getState for StateWrapperImpl - #48255

Closed
hannojg wants to merge 4 commits into
react:mainfrom
hannojg:feat/add-getstate-to-statewrapperimpl
Closed

feat: add getState for StateWrapperImpl#48255
hannojg wants to merge 4 commits into
react:mainfrom
hannojg:feat/add-getstate-to-statewrapperimpl

Conversation

@hannojg

@hannojghannojg commented Dec 13, 2024•
edited
Loading

Copy link
Copy Markdown
Contributor

Summary:

We're trying to pass jsi::Values directly to our view components (and convert them to java/swift types manually). That way we can pass "complex" objects to our views (such as jsi::Objects with NativeState attached, without the need to convert them to e.g. folly::dynamic).

On android we store our complex prop values on the StateWrapperImpl to pass the complex types between c++ and java/kotlin. See an example here:

https://github.com/hannojg/nitro/blob/2378fe7754294c496b2cbcd62f7109529e276427/packages/react-native-nitro-image/nitrogen/generated/android/c%2B%2B/JValueFromStateWrapper.cpp#L21-L23

 const auto& customStateData = dynamic_cast<const ConcreteState<CustomStateData>&>(state);
CustomStateData data = customStateData.getData();
std::shared_ptr<HybridTestObjectSwiftKotlinSpec> nativeProp = data.nativeProp;

(And then it might be used in java like this:)
https://github.com/hannojg/nitro/blob/2378fe7754294c496b2cbcd62f7109529e276427/packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/NitroExampleViewManager.java#L31-L38

publicObject updateState(@NonNull View view, ReactStylesDiffMap props, StateWrapper stateWrapper) {
StateWrapperImpl stateWrapperImpl = (StateWrapperImpl) stateWrapper;
HybridTestObjectSwiftKotlinSpec nativeProp =ValueFromStateWrapper.valueFromStateWrapper(stateWrapperImpl);
long value = nativeProp.getBigintValue();
Log.d("NitroExampleViewManager", "Value from state: "+ value);

For that we need to be able to access the underlying state, which is what we added in this PR.

Changelog:

[ANDROID] [ADDED] - Added getState method for StateWrapperImpl

Test Plan:

Internal change, just make sure all tests are passing

@facebook-github-botfacebook-github-bot added CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. Shared with Meta Applied via automation to indicate that an Issue or Pull Request has been shared with the team. labels Dec 13, 2024
@hannojghannojg mentioned this pull request Dec 13, 2024
Closed
javache
javache reviewed Dec 13, 2024
View reviewed changes
Comment threadpackages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h Outdated
jni::local_ref<ReadableNativeMap::jhybridobject> getStateDataImpl();
void updateStateImpl(NativeMap* map);
void setState(std::shared_ptr<const State> state);
const std::shared_ptr<const State> getState() const;

@javachejavacheDec 13, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The first const doesn't add any value

Suggested change
conststd::shared_ptr<constState>getState() const;
std::shared_ptr<constState>getState() const;

@hannojghannojgDec 13, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On a second thought, I think returning a const ref might be a better option here to avoid an unnecessary copy?

@javachejavacheDec 13, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's fine too. Although you do have to make sure you don't hold on to the shared_ptr beyond the lifecycle of the StateWrapperImpl then.

hannojgand others added 2 commits December 13, 2024 12:44
@hannojg@javache
Update packages/react-native/ReactAndroid/src/main/jni/react/fabric/S…
e7d35c2
…tateWrapperImpl.h
Co-authored-by: Pieter De Baets <pieter.debaets@gmail.com>
@hannojg
get by const ref
58ecef3
@hannojg
hannojg requested a review from javacheDecember 13, 2024 11:46
@facebook-github-bot

facebook-github-bot commented Dec 13, 2024

Copy link
Copy Markdown
Contributor

@javache has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

rubennorte
rubennorte reviewed Dec 13, 2024
View reviewed changes
Comment threadpackages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h Outdated
jni::local_ref<ReadableNativeMap::jhybridobject> getStateDataImpl();
void updateStateImpl(NativeMap* map);
void setState(std::shared_ptr<const State> state);
const std::shared_ptr<const State>& getState() const;

@rubennorterubennorteDec 13, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The state returned here is mutable, so returning a reference here seems a bit dangerous. We're making some assumptions about the fact that the caller will manage the lifecycle correctly. Maybe it'd be better to just return a copy of the shared pointer.

@hannojghannojgDec 13, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alright, agree - let me change!

@facebook-github-bot

facebook-github-bot commented Dec 13, 2024

Copy link
Copy Markdown
Contributor

@javache has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@facebook-github-botfacebook-github-bot added the Merged This PR has been merged. label Dec 13, 2024
@facebook-github-bot

facebook-github-bot commented Dec 13, 2024

Copy link
Copy Markdown
Contributor

@javache merged this pull request in ed36e89.

@react-native-bot

react-native-bot commented Dec 13, 2024

Copy link
Copy Markdown
Collaborator

This pull request was successfully merged by @hannojg in ed36e89

When will my fix make it into a release? | How to file a pick request?

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@javachejavachejavache approved these changes
@rubennorterubennorteAwaiting requested review from rubennorte

Assignees

No one assigned

Labels

CLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.MergedThis PR has been merged.Shared with MetaApplied via automation to indicate that an Issue or Pull Request has been shared with the team.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@hannojg@facebook-github-bot@react-native-bot@javache@rubennorte
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat: add getState for StateWrapperImpl - #48255
Closed
hannojg wants to merge 4 commits into
react:mainfrom 
hannojg:feat/add-getstate-to-statewrapperimpl
Closed
feat: add getState for StateWrapperImpl#48255
hannojg wants to merge 4 commits into
react:mainfrom 
hannojg:feat/add-getstate-to-statewrapperimpl
Conversation
@hannojg
@hannojghannojg
commented
Dec 13, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Summary:
We're trying to pass jsi::Values directly to our view components (and convert them to java/swift types manually). That way we can pass "complex" objects to our views (such as jsi::Objects with NativeState attached, without the need to convert them to e.g. folly::dynamic).
On android we store our complex prop values on the StateWrapperImpl to pass the complex types between c++ and java/kotlin. See an example here:
https://github.com/hannojg/nitro/blob/2378fe7754294c496b2cbcd62f7109529e276427/packages/react-native-nitro-image/nitrogen/generated/android/c%2B%2B/JValueFromStateWrapper.cpp#L21-L23
 const auto& customStateData = dynamic_cast<const ConcreteState<CustomStateData>&>(state);
CustomStateData data = customStateData.getData();
std::shared_ptr<HybridTestObjectSwiftKotlinSpec> nativeProp = data.nativeProp;

(And then it might be used in java like this:)
https://github.com/hannojg/nitro/blob/2378fe7754294c496b2cbcd62f7109529e276427/packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/NitroExampleViewManager.java#L31-L38
publicObject updateState(@NonNull View view, ReactStylesDiffMap props, StateWrapper stateWrapper) {
StateWrapperImpl stateWrapperImpl = (StateWrapperImpl) stateWrapper;
HybridTestObjectSwiftKotlinSpec nativeProp =ValueFromStateWrapper.valueFromStateWrapper(stateWrapperImpl);
long value = nativeProp.getBigintValue();
Log.d("NitroExampleViewManager", "Value from state: "+ value);
For that we need to be able to access the underlying state, which is what we added in this PR.
Changelog:
[ANDROID] [ADDED] - Added getState method for StateWrapperImpl
Test Plan:
Internal change, just make sure all tests are passing
@facebook-github-botfacebook-github-bot
added

CLA Signed
This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
Shared with Meta
Applied via automation to indicate that an Issue or Pull Request has been shared with the team.
labels
Dec 13, 2024
@hannojghannojg
mentioned this pull request
Dec 13, 2024
 Closed

javache
javache
reviewed
Dec 13, 2024
View reviewed changes
Comment threadpackages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h
Outdated

 jni::local_ref<ReadableNativeMap::jhybridobject> getStateDataImpl();
 void updateStateImpl(NativeMap* map);
 void setState(std::shared_ptr<const State> state);
 const std::shared_ptr<const State> getState() const;
@javachejavacheDec 13, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The first const doesn't add any value

Suggested change

conststd::shared_ptr<constState>getState() const;
std::shared_ptr<constState>getState() const;
@hannojghannojgDec 13, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On a second thought, I think returning a const ref might be a better option here to avoid an unnecessary copy?
@javachejavacheDec 13, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's fine too. Although you do have to make sure you don't hold on to the shared_ptr beyond the lifecycle of the StateWrapperImpl then.
hannojgand others
added 2 commits
December 13, 2024 12:44
@hannojg@javache
Update packages/react-native/ReactAndroid/src/main/jni/react/fabric/S…
e7d35c2
…tateWrapperImpl.h
Co-authored-by: Pieter De Baets <pieter.debaets@gmail.com>
@hannojg
get by const ref
58ecef3
@hannojg
hannojg
requested a review
from javacheDecember 13, 2024 11:46
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.
rubennorte
rubennorte
reviewed
Dec 13, 2024
View reviewed changes
Comment threadpackages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h
Outdated

 jni::local_ref<ReadableNativeMap::jhybridobject> getStateDataImpl();
 void updateStateImpl(NativeMap* map);
 void setState(std::shared_ptr<const State> state);
 const std::shared_ptr<const State>& getState() const;
@rubennorterubennorteDec 13, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The state returned here is mutable, so returning a reference here seems a bit dangerous. We're making some assumptions about the fact that the caller will manage the lifecycle correctly. Maybe it'd be better to just return a copy of the shared pointer.
@hannojghannojgDec 13, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alright, agree - let me change!
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.
@facebook-github-botfacebook-github-bot
added
the 
Merged
This PR has been merged.
label
Dec 13, 2024
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache merged this pull request in ed36e89.
@react-native-bot
react-native-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Collaborator
This pull request was successfully merged by @hannojg in ed36e89
When will my fix make it into a release? | How to file a pick request?
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@javachejavachejavache approved these changes
@rubennorterubennorteAwaiting requested review from rubennorte

Assignees


No one assigned


Labels

CLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.MergedThis PR has been merged.Shared with MetaApplied via automation to indicate that an Issue or Pull Request has been shared with the team.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@hannojg@facebook-github-bot@react-native-bot@javache@rubennorte

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: add getState for StateWrapperImpl - #48255
Closed
hannojg wants to merge 4 commits into
react:mainfrom 
hannojg:feat/add-getstate-to-statewrapperimpl
Closed
feat: add getState for StateWrapperImpl#48255
hannojg wants to merge 4 commits into
react:mainfrom 
hannojg:feat/add-getstate-to-statewrapperimpl
Conversation
@hannojg
@hannojghannojg
commented
Dec 13, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Summary:
We're trying to pass jsi::Values directly to our view components (and convert them to java/swift types manually). That way we can pass "complex" objects to our views (such as jsi::Objects with NativeState attached, without the need to convert them to e.g. folly::dynamic).
On android we store our complex prop values on the StateWrapperImpl to pass the complex types between c++ and java/kotlin. See an example here:
https://github.com/hannojg/nitro/blob/2378fe7754294c496b2cbcd62f7109529e276427/packages/react-native-nitro-image/nitrogen/generated/android/c%2B%2B/JValueFromStateWrapper.cpp#L21-L23
 const auto& customStateData = dynamic_cast<const ConcreteState<CustomStateData>&>(state);
CustomStateData data = customStateData.getData();
std::shared_ptr<HybridTestObjectSwiftKotlinSpec> nativeProp = data.nativeProp;

(And then it might be used in java like this:)
https://github.com/hannojg/nitro/blob/2378fe7754294c496b2cbcd62f7109529e276427/packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/NitroExampleViewManager.java#L31-L38
publicObject updateState(@NonNull View view, ReactStylesDiffMap props, StateWrapper stateWrapper) {
StateWrapperImpl stateWrapperImpl = (StateWrapperImpl) stateWrapper;
HybridTestObjectSwiftKotlinSpec nativeProp =ValueFromStateWrapper.valueFromStateWrapper(stateWrapperImpl);
long value = nativeProp.getBigintValue();
Log.d("NitroExampleViewManager", "Value from state: "+ value);
For that we need to be able to access the underlying state, which is what we added in this PR.
Changelog:
[ANDROID] [ADDED] - Added getState method for StateWrapperImpl
Test Plan:
Internal change, just make sure all tests are passing
@facebook-github-botfacebook-github-bot
added

CLA Signed
This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
Shared with Meta
Applied via automation to indicate that an Issue or Pull Request has been shared with the team.
labels
Dec 13, 2024
@hannojghannojg
mentioned this pull request
Dec 13, 2024
 Closed

javache
javache
reviewed
Dec 13, 2024
View reviewed changes
Comment threadpackages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h
Outdated

 jni::local_ref<ReadableNativeMap::jhybridobject> getStateDataImpl();
 void updateStateImpl(NativeMap* map);
 void setState(std::shared_ptr<const State> state);
 const std::shared_ptr<const State> getState() const;
@javachejavacheDec 13, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The first const doesn't add any value

Suggested change

conststd::shared_ptr<constState>getState() const;
std::shared_ptr<constState>getState() const;
@hannojghannojgDec 13, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On a second thought, I think returning a const ref might be a better option here to avoid an unnecessary copy?
@javachejavacheDec 13, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's fine too. Although you do have to make sure you don't hold on to the shared_ptr beyond the lifecycle of the StateWrapperImpl then.
hannojgand others
added 2 commits
December 13, 2024 12:44
@hannojg@javache
Update packages/react-native/ReactAndroid/src/main/jni/react/fabric/S…
e7d35c2
…tateWrapperImpl.h
Co-authored-by: Pieter De Baets <pieter.debaets@gmail.com>
@hannojg
get by const ref
58ecef3
@hannojg
hannojg
requested a review
from javacheDecember 13, 2024 11:46
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.
rubennorte
rubennorte
reviewed
Dec 13, 2024
View reviewed changes
Comment threadpackages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h
Outdated

 jni::local_ref<ReadableNativeMap::jhybridobject> getStateDataImpl();
 void updateStateImpl(NativeMap* map);
 void setState(std::shared_ptr<const State> state);
 const std::shared_ptr<const State>& getState() const;
@rubennorterubennorteDec 13, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The state returned here is mutable, so returning a reference here seems a bit dangerous. We're making some assumptions about the fact that the caller will manage the lifecycle correctly. Maybe it'd be better to just return a copy of the shared pointer.
@hannojghannojgDec 13, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alright, agree - let me change!
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.
@facebook-github-botfacebook-github-bot
added
the 
Merged
This PR has been merged.
label
Dec 13, 2024
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache merged this pull request in ed36e89.
@react-native-bot
react-native-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Collaborator
This pull request was successfully merged by @hannojg in ed36e89
When will my fix make it into a release? | How to file a pick request?
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@javachejavachejavache approved these changes
@rubennorterubennorteAwaiting requested review from rubennorte

Assignees


No one assigned


Labels

CLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.MergedThis PR has been merged.Shared with MetaApplied via automation to indicate that an Issue or Pull Request has been shared with the team.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@hannojg@facebook-github-bot@react-native-bot@javache@rubennorte

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: add getState for StateWrapperImpl - #48255
Closed
hannojg wants to merge 4 commits into
react:mainfrom 
hannojg:feat/add-getstate-to-statewrapperimpl
Closed
feat: add getState for StateWrapperImpl#48255
hannojg wants to merge 4 commits into
react:mainfrom 
hannojg:feat/add-getstate-to-statewrapperimpl
Conversation
@hannojg
@hannojghannojg
commented
Dec 13, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Summary:
We're trying to pass jsi::Values directly to our view components (and convert them to java/swift types manually). That way we can pass "complex" objects to our views (such as jsi::Objects with NativeState attached, without the need to convert them to e.g. folly::dynamic).
On android we store our complex prop values on the StateWrapperImpl to pass the complex types between c++ and java/kotlin. See an example here:
https://github.com/hannojg/nitro/blob/2378fe7754294c496b2cbcd62f7109529e276427/packages/react-native-nitro-image/nitrogen/generated/android/c%2B%2B/JValueFromStateWrapper.cpp#L21-L23
 const auto& customStateData = dynamic_cast<const ConcreteState<CustomStateData>&>(state);
CustomStateData data = customStateData.getData();
std::shared_ptr<HybridTestObjectSwiftKotlinSpec> nativeProp = data.nativeProp;

(And then it might be used in java like this:)
https://github.com/hannojg/nitro/blob/2378fe7754294c496b2cbcd62f7109529e276427/packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/NitroExampleViewManager.java#L31-L38
publicObject updateState(@NonNull View view, ReactStylesDiffMap props, StateWrapper stateWrapper) {
StateWrapperImpl stateWrapperImpl = (StateWrapperImpl) stateWrapper;
HybridTestObjectSwiftKotlinSpec nativeProp =ValueFromStateWrapper.valueFromStateWrapper(stateWrapperImpl);
long value = nativeProp.getBigintValue();
Log.d("NitroExampleViewManager", "Value from state: "+ value);
For that we need to be able to access the underlying state, which is what we added in this PR.
Changelog:
[ANDROID] [ADDED] - Added getState method for StateWrapperImpl
Test Plan:
Internal change, just make sure all tests are passing
@facebook-github-botfacebook-github-bot
added

CLA Signed
This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
Shared with Meta
Applied via automation to indicate that an Issue or Pull Request has been shared with the team.
labels
Dec 13, 2024
@hannojghannojg
mentioned this pull request
Dec 13, 2024
 Closed

javache
javache
reviewed
Dec 13, 2024
View reviewed changes
Comment threadpackages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h
Outdated

 jni::local_ref<ReadableNativeMap::jhybridobject> getStateDataImpl();
 void updateStateImpl(NativeMap* map);
 void setState(std::shared_ptr<const State> state);
 const std::shared_ptr<const State> getState() const;
@javachejavacheDec 13, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The first const doesn't add any value

Suggested change

conststd::shared_ptr<constState>getState() const;
std::shared_ptr<constState>getState() const;
@hannojghannojgDec 13, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On a second thought, I think returning a const ref might be a better option here to avoid an unnecessary copy?
@javachejavacheDec 13, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's fine too. Although you do have to make sure you don't hold on to the shared_ptr beyond the lifecycle of the StateWrapperImpl then.
hannojgand others
added 2 commits
December 13, 2024 12:44
@hannojg@javache
Update packages/react-native/ReactAndroid/src/main/jni/react/fabric/S…
e7d35c2
…tateWrapperImpl.h
Co-authored-by: Pieter De Baets <pieter.debaets@gmail.com>
@hannojg
get by const ref
58ecef3
@hannojg
hannojg
requested a review
from javacheDecember 13, 2024 11:46
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.
rubennorte
rubennorte
reviewed
Dec 13, 2024
View reviewed changes
Comment threadpackages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h
Outdated

 jni::local_ref<ReadableNativeMap::jhybridobject> getStateDataImpl();
 void updateStateImpl(NativeMap* map);
 void setState(std::shared_ptr<const State> state);
 const std::shared_ptr<const State>& getState() const;
@rubennorterubennorteDec 13, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The state returned here is mutable, so returning a reference here seems a bit dangerous. We're making some assumptions about the fact that the caller will manage the lifecycle correctly. Maybe it'd be better to just return a copy of the shared pointer.
@hannojghannojgDec 13, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alright, agree - let me change!
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.
@facebook-github-botfacebook-github-bot
added
the 
Merged
This PR has been merged.
label
Dec 13, 2024
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache merged this pull request in ed36e89.
@react-native-bot
react-native-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Collaborator
This pull request was successfully merged by @hannojg in ed36e89
When will my fix make it into a release? | How to file a pick request?
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@javachejavachejavache approved these changes
@rubennorterubennorteAwaiting requested review from rubennorte

Assignees


No one assigned


Labels

CLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.MergedThis PR has been merged.Shared with MetaApplied via automation to indicate that an Issue or Pull Request has been shared with the team.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@hannojg@facebook-github-bot@react-native-bot@javache@rubennorte

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat: add getState for StateWrapperImpl - #48255
Closed
hannojg wants to merge 4 commits into
react:mainfrom 
hannojg:feat/add-getstate-to-statewrapperimpl
Closed
feat: add getState for StateWrapperImpl#48255
hannojg wants to merge 4 commits into
react:mainfrom 
hannojg:feat/add-getstate-to-statewrapperimpl
Conversation
@hannojg
@hannojghannojg
commented
Dec 13, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Summary:
We're trying to pass jsi::Values directly to our view components (and convert them to java/swift types manually). That way we can pass "complex" objects to our views (such as jsi::Objects with NativeState attached, without the need to convert them to e.g. folly::dynamic).
On android we store our complex prop values on the StateWrapperImpl to pass the complex types between c++ and java/kotlin. See an example here:
https://github.com/hannojg/nitro/blob/2378fe7754294c496b2cbcd62f7109529e276427/packages/react-native-nitro-image/nitrogen/generated/android/c%2B%2B/JValueFromStateWrapper.cpp#L21-L23
 const auto& customStateData = dynamic_cast<const ConcreteState<CustomStateData>&>(state);
CustomStateData data = customStateData.getData();
std::shared_ptr<HybridTestObjectSwiftKotlinSpec> nativeProp = data.nativeProp;

(And then it might be used in java like this:)
https://github.com/hannojg/nitro/blob/2378fe7754294c496b2cbcd62f7109529e276427/packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/NitroExampleViewManager.java#L31-L38
publicObject updateState(@NonNull View view, ReactStylesDiffMap props, StateWrapper stateWrapper) {
StateWrapperImpl stateWrapperImpl = (StateWrapperImpl) stateWrapper;
HybridTestObjectSwiftKotlinSpec nativeProp =ValueFromStateWrapper.valueFromStateWrapper(stateWrapperImpl);
long value = nativeProp.getBigintValue();
Log.d("NitroExampleViewManager", "Value from state: "+ value);
For that we need to be able to access the underlying state, which is what we added in this PR.
Changelog:
[ANDROID] [ADDED] - Added getState method for StateWrapperImpl
Test Plan:
Internal change, just make sure all tests are passing
@facebook-github-botfacebook-github-bot
added

CLA Signed
This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
Shared with Meta
Applied via automation to indicate that an Issue or Pull Request has been shared with the team.
labels
Dec 13, 2024
@hannojghannojg
mentioned this pull request
Dec 13, 2024
 Closed

javache
javache
reviewed
Dec 13, 2024
View reviewed changes
Comment threadpackages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h
Outdated

 jni::local_ref<ReadableNativeMap::jhybridobject> getStateDataImpl();
 void updateStateImpl(NativeMap* map);
 void setState(std::shared_ptr<const State> state);
 const std::shared_ptr<const State> getState() const;
@javachejavacheDec 13, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The first const doesn't add any value

Suggested change

conststd::shared_ptr<constState>getState() const;
std::shared_ptr<constState>getState() const;
@hannojghannojgDec 13, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On a second thought, I think returning a const ref might be a better option here to avoid an unnecessary copy?
@javachejavacheDec 13, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's fine too. Although you do have to make sure you don't hold on to the shared_ptr beyond the lifecycle of the StateWrapperImpl then.
hannojgand others
added 2 commits
December 13, 2024 12:44
@hannojg@javache
Update packages/react-native/ReactAndroid/src/main/jni/react/fabric/S…
e7d35c2
…tateWrapperImpl.h
Co-authored-by: Pieter De Baets <pieter.debaets@gmail.com>
@hannojg
get by const ref
58ecef3
@hannojg
hannojg
requested a review
from javacheDecember 13, 2024 11:46
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.
rubennorte
rubennorte
reviewed
Dec 13, 2024
View reviewed changes
Comment threadpackages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h
Outdated

 jni::local_ref<ReadableNativeMap::jhybridobject> getStateDataImpl();
 void updateStateImpl(NativeMap* map);
 void setState(std::shared_ptr<const State> state);
 const std::shared_ptr<const State>& getState() const;
@rubennorterubennorteDec 13, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The state returned here is mutable, so returning a reference here seems a bit dangerous. We're making some assumptions about the fact that the caller will manage the lifecycle correctly. Maybe it'd be better to just return a copy of the shared pointer.
@hannojghannojgDec 13, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alright, agree - let me change!
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.
@facebook-github-botfacebook-github-bot
added
the 
Merged
This PR has been merged.
label
Dec 13, 2024
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache merged this pull request in ed36e89.
@react-native-bot
react-native-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Collaborator
This pull request was successfully merged by @hannojg in ed36e89
When will my fix make it into a release? | How to file a pick request?
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@javachejavachejavache approved these changes
@rubennorterubennorteAwaiting requested review from rubennorte

Assignees


No one assigned


Labels

CLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.MergedThis PR has been merged.Shared with MetaApplied via automation to indicate that an Issue or Pull Request has been shared with the team.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@hannojg@facebook-github-bot@react-native-bot@javache@rubennorte

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: add getState for StateWrapperImpl - #48255
Closed
hannojg wants to merge 4 commits into
react:mainfrom 
hannojg:feat/add-getstate-to-statewrapperimpl
Closed
feat: add getState for StateWrapperImpl#48255
hannojg wants to merge 4 commits into
react:mainfrom 
hannojg:feat/add-getstate-to-statewrapperimpl
Conversation
@hannojg
@hannojghannojg
commented
Dec 13, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Summary:
We're trying to pass jsi::Values directly to our view components (and convert them to java/swift types manually). That way we can pass "complex" objects to our views (such as jsi::Objects with NativeState attached, without the need to convert them to e.g. folly::dynamic).
On android we store our complex prop values on the StateWrapperImpl to pass the complex types between c++ and java/kotlin. See an example here:
https://github.com/hannojg/nitro/blob/2378fe7754294c496b2cbcd62f7109529e276427/packages/react-native-nitro-image/nitrogen/generated/android/c%2B%2B/JValueFromStateWrapper.cpp#L21-L23
 const auto& customStateData = dynamic_cast<const ConcreteState<CustomStateData>&>(state);
CustomStateData data = customStateData.getData();
std::shared_ptr<HybridTestObjectSwiftKotlinSpec> nativeProp = data.nativeProp;

(And then it might be used in java like this:)
https://github.com/hannojg/nitro/blob/2378fe7754294c496b2cbcd62f7109529e276427/packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/NitroExampleViewManager.java#L31-L38
publicObject updateState(@NonNull View view, ReactStylesDiffMap props, StateWrapper stateWrapper) {
StateWrapperImpl stateWrapperImpl = (StateWrapperImpl) stateWrapper;
HybridTestObjectSwiftKotlinSpec nativeProp =ValueFromStateWrapper.valueFromStateWrapper(stateWrapperImpl);
long value = nativeProp.getBigintValue();
Log.d("NitroExampleViewManager", "Value from state: "+ value);
For that we need to be able to access the underlying state, which is what we added in this PR.
Changelog:
[ANDROID] [ADDED] - Added getState method for StateWrapperImpl
Test Plan:
Internal change, just make sure all tests are passing
@facebook-github-botfacebook-github-bot
added

CLA Signed
This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
Shared with Meta
Applied via automation to indicate that an Issue or Pull Request has been shared with the team.
labels
Dec 13, 2024
@hannojghannojg
mentioned this pull request
Dec 13, 2024
 Closed

javache
javache
reviewed
Dec 13, 2024
View reviewed changes
Comment threadpackages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h
Outdated

 jni::local_ref<ReadableNativeMap::jhybridobject> getStateDataImpl();
 void updateStateImpl(NativeMap* map);
 void setState(std::shared_ptr<const State> state);
 const std::shared_ptr<const State> getState() const;
@javachejavacheDec 13, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The first const doesn't add any value

Suggested change

conststd::shared_ptr<constState>getState() const;
std::shared_ptr<constState>getState() const;
@hannojghannojgDec 13, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On a second thought, I think returning a const ref might be a better option here to avoid an unnecessary copy?
@javachejavacheDec 13, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's fine too. Although you do have to make sure you don't hold on to the shared_ptr beyond the lifecycle of the StateWrapperImpl then.
hannojgand others
added 2 commits
December 13, 2024 12:44
@hannojg@javache
Update packages/react-native/ReactAndroid/src/main/jni/react/fabric/S…
e7d35c2
…tateWrapperImpl.h
Co-authored-by: Pieter De Baets <pieter.debaets@gmail.com>
@hannojg
get by const ref
58ecef3
@hannojg
hannojg
requested a review
from javacheDecember 13, 2024 11:46
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.
rubennorte
rubennorte
reviewed
Dec 13, 2024
View reviewed changes
Comment threadpackages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h
Outdated

 jni::local_ref<ReadableNativeMap::jhybridobject> getStateDataImpl();
 void updateStateImpl(NativeMap* map);
 void setState(std::shared_ptr<const State> state);
 const std::shared_ptr<const State>& getState() const;
@rubennorterubennorteDec 13, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The state returned here is mutable, so returning a reference here seems a bit dangerous. We're making some assumptions about the fact that the caller will manage the lifecycle correctly. Maybe it'd be better to just return a copy of the shared pointer.
@hannojghannojgDec 13, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alright, agree - let me change!
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.
@facebook-github-botfacebook-github-bot
added
the 
Merged
This PR has been merged.
label
Dec 13, 2024
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache merged this pull request in ed36e89.
@react-native-bot
react-native-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Collaborator
This pull request was successfully merged by @hannojg in ed36e89
When will my fix make it into a release? | How to file a pick request?
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@javachejavachejavache approved these changes
@rubennorterubennorteAwaiting requested review from rubennorte

Assignees


No one assigned


Labels

CLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.MergedThis PR has been merged.Shared with MetaApplied via automation to indicate that an Issue or Pull Request has been shared with the team.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@hannojg@facebook-github-bot@react-native-bot@javache@rubennorte

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: add getState for StateWrapperImpl - #48255
Closed
hannojg wants to merge 4 commits into
react:mainfrom 
hannojg:feat/add-getstate-to-statewrapperimpl
Closed
feat: add getState for StateWrapperImpl#48255
hannojg wants to merge 4 commits into
react:mainfrom 
hannojg:feat/add-getstate-to-statewrapperimpl
Conversation
@hannojg
@hannojghannojg
commented
Dec 13, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Summary:
We're trying to pass jsi::Values directly to our view components (and convert them to java/swift types manually). That way we can pass "complex" objects to our views (such as jsi::Objects with NativeState attached, without the need to convert them to e.g. folly::dynamic).
On android we store our complex prop values on the StateWrapperImpl to pass the complex types between c++ and java/kotlin. See an example here:
https://github.com/hannojg/nitro/blob/2378fe7754294c496b2cbcd62f7109529e276427/packages/react-native-nitro-image/nitrogen/generated/android/c%2B%2B/JValueFromStateWrapper.cpp#L21-L23
 const auto& customStateData = dynamic_cast<const ConcreteState<CustomStateData>&>(state);
CustomStateData data = customStateData.getData();
std::shared_ptr<HybridTestObjectSwiftKotlinSpec> nativeProp = data.nativeProp;

(And then it might be used in java like this:)
https://github.com/hannojg/nitro/blob/2378fe7754294c496b2cbcd62f7109529e276427/packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/NitroExampleViewManager.java#L31-L38
publicObject updateState(@NonNull View view, ReactStylesDiffMap props, StateWrapper stateWrapper) {
StateWrapperImpl stateWrapperImpl = (StateWrapperImpl) stateWrapper;
HybridTestObjectSwiftKotlinSpec nativeProp =ValueFromStateWrapper.valueFromStateWrapper(stateWrapperImpl);
long value = nativeProp.getBigintValue();
Log.d("NitroExampleViewManager", "Value from state: "+ value);
For that we need to be able to access the underlying state, which is what we added in this PR.
Changelog:
[ANDROID] [ADDED] - Added getState method for StateWrapperImpl
Test Plan:
Internal change, just make sure all tests are passing
@facebook-github-botfacebook-github-bot
added

CLA Signed
This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
Shared with Meta
Applied via automation to indicate that an Issue or Pull Request has been shared with the team.
labels
Dec 13, 2024
@hannojghannojg
mentioned this pull request
Dec 13, 2024
 Closed

javache
javache
reviewed
Dec 13, 2024
View reviewed changes
Comment threadpackages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h
Outdated

 jni::local_ref<ReadableNativeMap::jhybridobject> getStateDataImpl();
 void updateStateImpl(NativeMap* map);
 void setState(std::shared_ptr<const State> state);
 const std::shared_ptr<const State> getState() const;
@javachejavacheDec 13, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The first const doesn't add any value

Suggested change

conststd::shared_ptr<constState>getState() const;
std::shared_ptr<constState>getState() const;
@hannojghannojgDec 13, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On a second thought, I think returning a const ref might be a better option here to avoid an unnecessary copy?
@javachejavacheDec 13, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's fine too. Although you do have to make sure you don't hold on to the shared_ptr beyond the lifecycle of the StateWrapperImpl then.
hannojgand others
added 2 commits
December 13, 2024 12:44
@hannojg@javache
Update packages/react-native/ReactAndroid/src/main/jni/react/fabric/S…
e7d35c2
…tateWrapperImpl.h
Co-authored-by: Pieter De Baets <pieter.debaets@gmail.com>
@hannojg
get by const ref
58ecef3
@hannojg
hannojg
requested a review
from javacheDecember 13, 2024 11:46
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.
rubennorte
rubennorte
reviewed
Dec 13, 2024
View reviewed changes
Comment threadpackages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h
Outdated

 jni::local_ref<ReadableNativeMap::jhybridobject> getStateDataImpl();
 void updateStateImpl(NativeMap* map);
 void setState(std::shared_ptr<const State> state);
 const std::shared_ptr<const State>& getState() const;
@rubennorterubennorteDec 13, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The state returned here is mutable, so returning a reference here seems a bit dangerous. We're making some assumptions about the fact that the caller will manage the lifecycle correctly. Maybe it'd be better to just return a copy of the shared pointer.
@hannojghannojgDec 13, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alright, agree - let me change!
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.
@facebook-github-botfacebook-github-bot
added
the 
Merged
This PR has been merged.
label
Dec 13, 2024
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache merged this pull request in ed36e89.
@react-native-bot
react-native-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Collaborator
This pull request was successfully merged by @hannojg in ed36e89
When will my fix make it into a release? | How to file a pick request?
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@javachejavachejavache approved these changes
@rubennorterubennorteAwaiting requested review from rubennorte

Assignees


No one assigned


Labels

CLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.MergedThis PR has been merged.Shared with MetaApplied via automation to indicate that an Issue or Pull Request has been shared with the team.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@hannojg@facebook-github-bot@react-native-bot@javache@rubennorte

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat: add getState for StateWrapperImpl - #48255
Closed
hannojg wants to merge 4 commits into
react:mainfrom 
hannojg:feat/add-getstate-to-statewrapperimpl
Closed
feat: add getState for StateWrapperImpl#48255
hannojg wants to merge 4 commits into
react:mainfrom 
hannojg:feat/add-getstate-to-statewrapperimpl
Conversation
@hannojg
@hannojghannojg
commented
Dec 13, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Summary:
We're trying to pass jsi::Values directly to our view components (and convert them to java/swift types manually). That way we can pass "complex" objects to our views (such as jsi::Objects with NativeState attached, without the need to convert them to e.g. folly::dynamic).
On android we store our complex prop values on the StateWrapperImpl to pass the complex types between c++ and java/kotlin. See an example here:
https://github.com/hannojg/nitro/blob/2378fe7754294c496b2cbcd62f7109529e276427/packages/react-native-nitro-image/nitrogen/generated/android/c%2B%2B/JValueFromStateWrapper.cpp#L21-L23
 const auto& customStateData = dynamic_cast<const ConcreteState<CustomStateData>&>(state);
CustomStateData data = customStateData.getData();
std::shared_ptr<HybridTestObjectSwiftKotlinSpec> nativeProp = data.nativeProp;

(And then it might be used in java like this:)
https://github.com/hannojg/nitro/blob/2378fe7754294c496b2cbcd62f7109529e276427/packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/NitroExampleViewManager.java#L31-L38
publicObject updateState(@NonNull View view, ReactStylesDiffMap props, StateWrapper stateWrapper) {
StateWrapperImpl stateWrapperImpl = (StateWrapperImpl) stateWrapper;
HybridTestObjectSwiftKotlinSpec nativeProp =ValueFromStateWrapper.valueFromStateWrapper(stateWrapperImpl);
long value = nativeProp.getBigintValue();
Log.d("NitroExampleViewManager", "Value from state: "+ value);
For that we need to be able to access the underlying state, which is what we added in this PR.
Changelog:
[ANDROID] [ADDED] - Added getState method for StateWrapperImpl
Test Plan:
Internal change, just make sure all tests are passing
@facebook-github-botfacebook-github-bot
added

CLA Signed
This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
Shared with Meta
Applied via automation to indicate that an Issue or Pull Request has been shared with the team.
labels
Dec 13, 2024
@hannojghannojg
mentioned this pull request
Dec 13, 2024
 Closed

javache
javache
reviewed
Dec 13, 2024
View reviewed changes
Comment threadpackages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h
Outdated

 jni::local_ref<ReadableNativeMap::jhybridobject> getStateDataImpl();
 void updateStateImpl(NativeMap* map);
 void setState(std::shared_ptr<const State> state);
 const std::shared_ptr<const State> getState() const;
@javachejavacheDec 13, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The first const doesn't add any value

Suggested change

conststd::shared_ptr<constState>getState() const;
std::shared_ptr<constState>getState() const;
@hannojghannojgDec 13, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On a second thought, I think returning a const ref might be a better option here to avoid an unnecessary copy?
@javachejavacheDec 13, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's fine too. Although you do have to make sure you don't hold on to the shared_ptr beyond the lifecycle of the StateWrapperImpl then.
hannojgand others
added 2 commits
December 13, 2024 12:44
@hannojg@javache
Update packages/react-native/ReactAndroid/src/main/jni/react/fabric/S…
e7d35c2
…tateWrapperImpl.h
Co-authored-by: Pieter De Baets <pieter.debaets@gmail.com>
@hannojg
get by const ref
58ecef3
@hannojg
hannojg
requested a review
from javacheDecember 13, 2024 11:46
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.
rubennorte
rubennorte
reviewed
Dec 13, 2024
View reviewed changes
Comment threadpackages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h
Outdated

 jni::local_ref<ReadableNativeMap::jhybridobject> getStateDataImpl();
 void updateStateImpl(NativeMap* map);
 void setState(std::shared_ptr<const State> state);
 const std::shared_ptr<const State>& getState() const;
@rubennorterubennorteDec 13, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The state returned here is mutable, so returning a reference here seems a bit dangerous. We're making some assumptions about the fact that the caller will manage the lifecycle correctly. Maybe it'd be better to just return a copy of the shared pointer.
@hannojghannojgDec 13, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alright, agree - let me change!
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.
@facebook-github-botfacebook-github-bot
added
the 
Merged
This PR has been merged.
label
Dec 13, 2024
@facebook-github-bot
facebook-github-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Contributor
@javache merged this pull request in ed36e89.
@react-native-bot
react-native-bot
commented
Dec 13, 2024

Copy link


Copy Markdown

Collaborator
This pull request was successfully merged by @hannojg in ed36e89
When will my fix make it into a release? | How to file a pick request?
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@javachejavachejavache approved these changes
@rubennorterubennorteAwaiting requested review from rubennorte

Assignees


No one assigned


Labels

CLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.MergedThis PR has been merged.Shared with MetaApplied via automation to indicate that an Issue or Pull Request has been shared with the team.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@hannojg@facebook-github-bot@react-native-bot@javache@rubennorte