expo-snowui 1.7.39 → 1.7.41
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/module/context/snow-focus-context.js +4 -1
- package/lib/module/context/snow-focus-context.js.map +1 -1
- package/lib/module/context/snow-navigation-context.js +7 -0
- package/lib/module/context/snow-navigation-context.js.map +1 -1
- package/package.json +1 -1
- package/src/context/snow-focus-context.js +6 -1
- package/src/context/snow-navigation-context.js +6 -0
|
@@ -185,6 +185,7 @@ export const FocusContextProvider = props => {
|
|
|
185
185
|
const focusStartRef = React.useRef(null);
|
|
186
186
|
const focusRouteRef = React.useRef(null);
|
|
187
187
|
const boundaryNameRef = React.useRef(null);
|
|
188
|
+
const boundaryChangedRef = React.useRef(false);
|
|
188
189
|
const scrollViewRef = React.useRef(null);
|
|
189
190
|
const scrollOffsetRef = React.useRef(0);
|
|
190
191
|
const scrollViewHeightRef = React.useRef(0);
|
|
@@ -192,6 +193,7 @@ export const FocusContextProvider = props => {
|
|
|
192
193
|
const [scrollViewHeight, setScrollViewHeight] = React.useState(0);
|
|
193
194
|
const [focusBoundaryPath, setBoundaryPath] = React.useState(null);
|
|
194
195
|
const setBoundary = (name, path) => {
|
|
196
|
+
boundaryChangedRef.current = true;
|
|
195
197
|
if (name) {
|
|
196
198
|
boundaryNameRef.current = name;
|
|
197
199
|
setBoundaryPath(path);
|
|
@@ -213,8 +215,9 @@ export const FocusContextProvider = props => {
|
|
|
213
215
|
});
|
|
214
216
|
}
|
|
215
217
|
const isNewRoute = focusRouteRef.current !== currentRoute?.routePath;
|
|
216
|
-
if (isNewRoute || !focusedHash) {
|
|
218
|
+
if (isNewRoute || !focusedHash || boundaryChangedRef.current) {
|
|
217
219
|
focusStartRef.current = focusStart;
|
|
220
|
+
boundaryChangedRef.current = false;
|
|
218
221
|
if (isNewRoute) {
|
|
219
222
|
lastFocusedStaticYRef.current = null;
|
|
220
223
|
navRemove('focusedHash');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","Platform","findNodeHandle","UIManager","useDebouncedCallback","util","prettyLog","useInputContext","useNavigationContext","Tree","NeighborMap","jsx","_jsx","RebuildDebounceMilliseconds","ParentPathContext","createContext","FocusContext","useFocusAppContext","useContext","useFocusContext","componentName","props","registerFocus","unregisterFocus","focusedHash","focusOn","setFocusStart","setBoundary","moveFocusRight","moveFocusUp","moveFocusDown","moveFocusLeft","pressFocused","updateFocus","scrollViewRef","setScrollViewHeight","inheritedParentPath","focusRef","useRef","xx","yy","parentPath","focusKey","canFocus","focusStart","trapFocusRight","trapFocusLeft","boundaryName","boundary","focusPath","DELIM","focusHash","getPathHash","actionPress","onPress","actionLongPress","onLongPress","useEffect","isFocused","OS","current","focus","node","dispatchViewManagerCommand","getViewManagerConfig","Commands","focusWrap","child","tvRemoteProps","actions","isTV","Provider","value","children","cloneElement","focusable","accessible","ref","testID","onLayout","event","scrollNode","requestAnimationFrame","scrollTag","measureLayout","width","height","staticY","swallow","FocusContextProvider","FOCUS_ENABLED","ENABLE_FOCUS","DEBUG","DEBUG_FOCUS","firstDebug","setFirstDebug","useState","currentRoute","navUpdate","navRemove","addActionListener","removeActionListener","actionsRef","registryRef","adjacenciesRef","Map","routeParams","focusedHashRef","focusedPathRef","focusStartRef","focusRouteRef","boundaryNameRef","scrollOffsetRef","scrollViewHeightRef","lastFocusedStaticYRef","scrollViewHeight","focusBoundaryPath","setBoundaryPath","name","path","DEBUG_FOCUS_TREE","context","action","isNewRoute","routePath","updateAdjacencies","build","currentEntry","findHash","scrollIntoView","target","debug","neighbors","setScrollViewRef","setScrollOffset","offset","handleSetScrollViewHeight","h","lastScrollYRef","find","item","actualScrollRef","currentOffset","viewportTop","viewportBottom","bottomMargin","topMargin","centeredY","delta","Math","abs","max","scrollTo","y","animated","payload","insert","prune","moveFocus","direction","sourceEntry","destinationFocusPath","get","startsWith","hash","getFocusedNode","topLeft","findTopLeft","longPressFocused","onUp","onDown","onRight","onLeft","executeAction","key","args","useMemo"],"sourceRoot":"../../../src","sources":["context/snow-focus-context.js"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["React","Platform","findNodeHandle","UIManager","useDebouncedCallback","util","prettyLog","useInputContext","useNavigationContext","Tree","NeighborMap","jsx","_jsx","RebuildDebounceMilliseconds","ParentPathContext","createContext","FocusContext","useFocusAppContext","useContext","useFocusContext","componentName","props","registerFocus","unregisterFocus","focusedHash","focusOn","setFocusStart","setBoundary","moveFocusRight","moveFocusUp","moveFocusDown","moveFocusLeft","pressFocused","updateFocus","scrollViewRef","setScrollViewHeight","inheritedParentPath","focusRef","useRef","xx","yy","parentPath","focusKey","canFocus","focusStart","trapFocusRight","trapFocusLeft","boundaryName","boundary","focusPath","DELIM","focusHash","getPathHash","actionPress","onPress","actionLongPress","onLongPress","useEffect","isFocused","OS","current","focus","node","dispatchViewManagerCommand","getViewManagerConfig","Commands","focusWrap","child","tvRemoteProps","actions","isTV","Provider","value","children","cloneElement","focusable","accessible","ref","testID","onLayout","event","scrollNode","requestAnimationFrame","scrollTag","measureLayout","width","height","staticY","swallow","FocusContextProvider","FOCUS_ENABLED","ENABLE_FOCUS","DEBUG","DEBUG_FOCUS","firstDebug","setFirstDebug","useState","currentRoute","navUpdate","navRemove","addActionListener","removeActionListener","actionsRef","registryRef","adjacenciesRef","Map","routeParams","focusedHashRef","focusedPathRef","focusStartRef","focusRouteRef","boundaryNameRef","boundaryChangedRef","scrollOffsetRef","scrollViewHeightRef","lastFocusedStaticYRef","scrollViewHeight","focusBoundaryPath","setBoundaryPath","name","path","DEBUG_FOCUS_TREE","context","action","isNewRoute","routePath","updateAdjacencies","build","currentEntry","findHash","scrollIntoView","target","debug","neighbors","setScrollViewRef","setScrollOffset","offset","handleSetScrollViewHeight","h","lastScrollYRef","find","item","actualScrollRef","currentOffset","viewportTop","viewportBottom","bottomMargin","topMargin","centeredY","delta","Math","abs","max","scrollTo","y","animated","payload","insert","prune","moveFocus","direction","sourceEntry","destinationFocusPath","get","startsWith","hash","getFocusedNode","topLeft","findTopLeft","longPressFocused","onUp","onDown","onRight","onLeft","executeAction","key","args","useMemo"],"sourceRoot":"../../../src","sources":["context/snow-focus-context.js"],"mappings":"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","ignoreList":[]}
|
|
@@ -50,6 +50,7 @@ export function NavigationContextProvider(props) {
|
|
|
50
50
|
const [initialPath, setInitialPath] = React.useState(null);
|
|
51
51
|
const [navigationHistory, setNavigationHistory] = React.useState(null);
|
|
52
52
|
const navigationHistoryRef = React.useRef(null);
|
|
53
|
+
const popInProgressRef = React.useRef(false);
|
|
53
54
|
|
|
54
55
|
// Debounce the history so children only see the "settled" state (e.g. after multiple unmounts)
|
|
55
56
|
const [debouncedHistory] = useDebounce(navigationHistory, 100);
|
|
@@ -163,6 +164,7 @@ export function NavigationContextProvider(props) {
|
|
|
163
164
|
};
|
|
164
165
|
const navPop = isFunc => {
|
|
165
166
|
const func = () => {
|
|
167
|
+
popInProgressRef.current = true;
|
|
166
168
|
setNavigationHistory(prev => {
|
|
167
169
|
let result = [...prev];
|
|
168
170
|
if (result.length > 1) {
|
|
@@ -178,6 +180,9 @@ export function NavigationContextProvider(props) {
|
|
|
178
180
|
}
|
|
179
181
|
return result;
|
|
180
182
|
});
|
|
183
|
+
setTimeout(() => {
|
|
184
|
+
popInProgressRef.current = false;
|
|
185
|
+
}, 0);
|
|
181
186
|
};
|
|
182
187
|
if (isFunc) {
|
|
183
188
|
return func;
|
|
@@ -258,6 +263,7 @@ export function NavigationContextProvider(props) {
|
|
|
258
263
|
return /*#__PURE__*/_jsx(_Fragment, {});
|
|
259
264
|
}
|
|
260
265
|
const navUpdate = delta => {
|
|
266
|
+
if (popInProgressRef.current) return;
|
|
261
267
|
const latestParams = navigationHistoryRef.current?.at(-1)?.routeParams || {};
|
|
262
268
|
navPush({
|
|
263
269
|
params: {
|
|
@@ -269,6 +275,7 @@ export function NavigationContextProvider(props) {
|
|
|
269
275
|
});
|
|
270
276
|
};
|
|
271
277
|
const navRemove = urlParam => {
|
|
278
|
+
if (popInProgressRef.current) return;
|
|
272
279
|
const latestParams = {
|
|
273
280
|
...(navigationHistoryRef.current?.at(-1)?.routeParams || {})
|
|
274
281
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","Platform","useDebounce","useInputContext","util","prettyLog","Fragment","_Fragment","jsx","_jsx","NavigationContext","createContext","useNavigationContext","value","useContext","Error","NavigationContextProvider","props","DEBUG","DEBUG_NAVIGATION","addBackListener","removeBackListener","blockBackActionRef","useRef","blockBackAction","block","current","isReady","setIsReady","useState","pageLookup","setPageLookup","initialPath","setInitialPath","navigationHistory","setNavigationHistory","navigationHistoryRef","debouncedHistory","useEffect","lookup","routePaths","console","log","pathKey","Object","keys","initialRoutePath","routePages","pageKey","page","initialRoute","initialParams","OS","window","location","pathname","queryToObject","search","routePath","routeParams","navPush","payload","foundPath","path","foundParams","params","foundFunc","func","foundReplace","replace","undefined","at","prev","result","history","replaceState","stateToUrl","push","pushState","context","action","navPop","isFunc","length","pop","navReset","resetPath","resetRoutePath","currentRoute","navUpdate","delta","latestParams","navRemove","urlParam","CurrentPage","Provider","style","flex","children"],"sourceRoot":"../../../src","sources":["context/snow-navigation-context.js"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,QAAQ,QAAQ,cAAc;AACvC,SAASC,WAAW,QAAQ,cAAc;AAE1C,SAASC,eAAe,QAAQ,yBAAsB;AAEtD,OAAOC,IAAI,IAAIC,SAAS,QAAQ,YAAS;AAAA,SAAAC,QAAA,IAAAC,SAAA,EAAAC,GAAA,IAAAC,IAAA;AAEzC,MAAMC,iBAAiB,gBAAGV,KAAK,CAACW,aAAa,CAAC,CAAC,CAAC,CAAC;AAEjD,OAAO,SAASC,oBAAoBA,CAAA,EAAG;EACnC,MAAMC,KAAK,GAAGb,KAAK,CAACc,UAAU,CAACJ,iBAAiB,CAAC;EACjD,IAAI,CAACG,KAAK,EAAE;IACR,MAAM,IAAIE,KAAK,CAAC,yEAAyE,CAAC;EAC9F;EACA,OAAOF,KAAK;AAChB;;AAEA;AACA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASG,yBAAyBA,CAACC,KAAK,EAAE;EAC7C,MAAMC,KAAK,GAAGD,KAAK,CAACE,gBAAgB;EAEpC,MAAM;IAAEC,eAAe;IAAEC;EAAmB,CAAC,GAAGlB,eAAe,CAAC,CAAC;EAEjE,MAAMmB,kBAAkB,GAAGtB,KAAK,CAACuB,MAAM,CAAC,KAAK,CAAC;EAE9C,MAAMC,eAAe,GAAIC,KAAK,IAAK;IAC/BH,kBAAkB,CAACI,OAAO,GAAGD,KAAK;EACtC,CAAC;EAED,MAAM,CAACE,OAAO,EAAEC,UAAU,CAAC,GAAG5B,KAAK,CAAC6B,QAAQ,CAAC,KAAK,CAAC;EAEnD,MAAM,CAACC,UAAU,EAAEC,aAAa,CAAC,GAAG/B,KAAK,CAAC6B,QAAQ,CAAC,CAAC,CAAC,CAAC;EACtD,MAAM,CAACG,WAAW,EAAEC,cAAc,CAAC,GAAGjC,KAAK,CAAC6B,QAAQ,CAAC,IAAI,CAAC;EAE1D,MAAM,CAACK,iBAAiB,EAAEC,oBAAoB,CAAC,GAAGnC,KAAK,CAAC6B,QAAQ,CAAC,IAAI,CAAC;EACtE,MAAMO,oBAAoB,GAAGpC,KAAK,CAACuB,MAAM,CAAC,IAAI,CAAC
|
|
1
|
+
{"version":3,"names":["React","Platform","useDebounce","useInputContext","util","prettyLog","Fragment","_Fragment","jsx","_jsx","NavigationContext","createContext","useNavigationContext","value","useContext","Error","NavigationContextProvider","props","DEBUG","DEBUG_NAVIGATION","addBackListener","removeBackListener","blockBackActionRef","useRef","blockBackAction","block","current","isReady","setIsReady","useState","pageLookup","setPageLookup","initialPath","setInitialPath","navigationHistory","setNavigationHistory","navigationHistoryRef","popInProgressRef","debouncedHistory","useEffect","lookup","routePaths","console","log","pathKey","Object","keys","initialRoutePath","routePages","pageKey","page","initialRoute","initialParams","OS","window","location","pathname","queryToObject","search","routePath","routeParams","navPush","payload","foundPath","path","foundParams","params","foundFunc","func","foundReplace","replace","undefined","at","prev","result","history","replaceState","stateToUrl","push","pushState","context","action","navPop","isFunc","length","pop","setTimeout","navReset","resetPath","resetRoutePath","currentRoute","navUpdate","delta","latestParams","navRemove","urlParam","CurrentPage","Provider","style","flex","children"],"sourceRoot":"../../../src","sources":["context/snow-navigation-context.js"],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -205,7 +205,10 @@ export const FocusContextProvider = (props) => {
|
|
|
205
205
|
const focusedPathRef = React.useRef(null)
|
|
206
206
|
const focusStartRef = React.useRef(null)
|
|
207
207
|
const focusRouteRef = React.useRef(null)
|
|
208
|
+
|
|
208
209
|
const boundaryNameRef = React.useRef(null)
|
|
210
|
+
const boundaryChangedRef = React.useRef(false)
|
|
211
|
+
|
|
209
212
|
const scrollViewRef = React.useRef(null)
|
|
210
213
|
const scrollOffsetRef = React.useRef(0)
|
|
211
214
|
const scrollViewHeightRef = React.useRef(0)
|
|
@@ -214,6 +217,7 @@ export const FocusContextProvider = (props) => {
|
|
|
214
217
|
const [focusBoundaryPath, setBoundaryPath] = React.useState(null)
|
|
215
218
|
|
|
216
219
|
const setBoundary = (name, path) => {
|
|
220
|
+
boundaryChangedRef.current = true
|
|
217
221
|
if (name) {
|
|
218
222
|
boundaryNameRef.current = name
|
|
219
223
|
setBoundaryPath(path)
|
|
@@ -230,8 +234,9 @@ export const FocusContextProvider = (props) => {
|
|
|
230
234
|
prettyLog({ context: 'focus', action: 'setFocusStart', focusStart })
|
|
231
235
|
}
|
|
232
236
|
const isNewRoute = focusRouteRef.current !== currentRoute?.routePath
|
|
233
|
-
if (isNewRoute || !focusedHash) {
|
|
237
|
+
if (isNewRoute || !focusedHash || boundaryChangedRef.current) {
|
|
234
238
|
focusStartRef.current = focusStart
|
|
239
|
+
boundaryChangedRef.current = false
|
|
235
240
|
if (isNewRoute) {
|
|
236
241
|
lastFocusedStaticYRef.current = null
|
|
237
242
|
navRemove('focusedHash')
|
|
@@ -56,6 +56,8 @@ export function NavigationContextProvider(props) {
|
|
|
56
56
|
const [navigationHistory, setNavigationHistory] = React.useState(null)
|
|
57
57
|
const navigationHistoryRef = React.useRef(null)
|
|
58
58
|
|
|
59
|
+
const popInProgressRef = React.useRef(false)
|
|
60
|
+
|
|
59
61
|
// Debounce the history so children only see the "settled" state (e.g. after multiple unmounts)
|
|
60
62
|
const [debouncedHistory] = useDebounce(navigationHistory, 100)
|
|
61
63
|
|
|
@@ -164,6 +166,7 @@ export function NavigationContextProvider(props) {
|
|
|
164
166
|
|
|
165
167
|
const navPop = (isFunc) => {
|
|
166
168
|
const func = () => {
|
|
169
|
+
popInProgressRef.current = true
|
|
167
170
|
setNavigationHistory((prev) => {
|
|
168
171
|
let result = [...prev]
|
|
169
172
|
if (result.length > 1) {
|
|
@@ -174,6 +177,7 @@ export function NavigationContextProvider(props) {
|
|
|
174
177
|
}
|
|
175
178
|
return result
|
|
176
179
|
})
|
|
180
|
+
setTimeout(() => { popInProgressRef.current = false }, 0)
|
|
177
181
|
}
|
|
178
182
|
if (isFunc) {
|
|
179
183
|
return func
|
|
@@ -236,6 +240,7 @@ export function NavigationContextProvider(props) {
|
|
|
236
240
|
}
|
|
237
241
|
|
|
238
242
|
const navUpdate = ((delta) => {
|
|
243
|
+
if (popInProgressRef.current) return
|
|
239
244
|
const latestParams = navigationHistoryRef.current?.at(-1)?.routeParams || {}
|
|
240
245
|
navPush({
|
|
241
246
|
params: { ...latestParams, ...delta },
|
|
@@ -245,6 +250,7 @@ export function NavigationContextProvider(props) {
|
|
|
245
250
|
})
|
|
246
251
|
|
|
247
252
|
const navRemove = ((urlParam) => {
|
|
253
|
+
if (popInProgressRef.current) return
|
|
248
254
|
const latestParams = { ...(navigationHistoryRef.current?.at(-1)?.routeParams || {}) }
|
|
249
255
|
delete latestParams[urlParam]
|
|
250
256
|
navPush({
|