@r0b0t3d/react-native-collapsible 1.4.0 → 1.4.2
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/commonjs/components/CollapsibleContainer.js +2 -2
- package/lib/commonjs/components/CollapsibleContainer.js.map +1 -1
- package/lib/commonjs/components/header/StickyView.js +4 -4
- package/lib/commonjs/components/header/StickyView.js.map +1 -1
- package/lib/commonjs/withCollapsibleContext.js +38 -12
- package/lib/commonjs/withCollapsibleContext.js.map +1 -1
- package/lib/module/components/CollapsibleContainer.js +2 -2
- package/lib/module/components/CollapsibleContainer.js.map +1 -1
- package/lib/module/components/header/StickyView.js +5 -5
- package/lib/module/components/header/StickyView.js.map +1 -1
- package/lib/module/withCollapsibleContext.js +38 -12
- package/lib/module/withCollapsibleContext.js.map +1 -1
- package/lib/typescript/components/header/StickyView.d.ts +2 -1
- package/lib/typescript/components/header/StickyView.d.ts.map +1 -1
- package/lib/typescript/types.d.ts +17 -0
- package/lib/typescript/types.d.ts.map +1 -1
- package/lib/typescript/withCollapsibleContext.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/components/CollapsibleContainer.tsx +2 -2
- package/src/components/header/StickyView.tsx +6 -7
- package/src/types.ts +17 -0
- package/src/withCollapsibleContext.tsx +39 -1
|
@@ -21,9 +21,9 @@ function CollapsibleContainer(_ref) {
|
|
|
21
21
|
textInputRefs = [],
|
|
22
22
|
...props
|
|
23
23
|
} = _ref;
|
|
24
|
-
const containerRef = (0, _react.useRef)(null);
|
|
25
24
|
const {
|
|
26
|
-
handleContainerHeight
|
|
25
|
+
handleContainerHeight,
|
|
26
|
+
containerRef
|
|
27
27
|
} = (0, _useInternalCollapsibleContext.default)();
|
|
28
28
|
const {
|
|
29
29
|
scrollY,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_useKeyboardShowEvent","_interopRequireDefault","_useInternalCollapsibleContext","_useCollapsibleContext","_CollapsibleHeaderConsumer","obj","__esModule","default","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","_extends","assign","bind","target","i","arguments","length","source","apply","CollapsibleContainer","_ref","children","keyboardAvoidingViewProps","textInputRefs","props","
|
|
1
|
+
{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_useKeyboardShowEvent","_interopRequireDefault","_useInternalCollapsibleContext","_useCollapsibleContext","_CollapsibleHeaderConsumer","obj","__esModule","default","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","_extends","assign","bind","target","i","arguments","length","source","apply","CollapsibleContainer","_ref","children","keyboardAvoidingViewProps","textInputRefs","props","handleContainerHeight","containerRef","useInternalCollapsibleContext","scrollY","scrollTo","useCollapsibleContext","containerHeight","useRef","useKeyboardShowEvent","some","ref","isFocusedFunc","current","isFocused","measureLayout","_left","top","_width","height","value","extraOffset","keyboardVerticalOffset","handleContainerLayout","useCallback","layout","nativeEvent","createElement","KeyboardAvoidingView","style","styles","container","behavior","View","onLayout","collapsable","StyleSheet","create","flex","overflow"],"sourceRoot":"../../../src","sources":["components/CollapsibleContainer.tsx"],"mappings":"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"}
|
|
@@ -17,10 +17,10 @@ let stickyKey = 0;
|
|
|
17
17
|
function StickyView(_ref) {
|
|
18
18
|
let {
|
|
19
19
|
children,
|
|
20
|
-
style
|
|
20
|
+
style,
|
|
21
|
+
stickyRef
|
|
21
22
|
} = _ref;
|
|
22
23
|
const key = (0, _react.useMemo)(() => `sticky_${stickyKey++}`, []);
|
|
23
|
-
const viewRef = (0, _react.useRef)(null);
|
|
24
24
|
const {
|
|
25
25
|
handleStickyViewLayout,
|
|
26
26
|
animatedY
|
|
@@ -47,7 +47,7 @@ function StickyView(_ref) {
|
|
|
47
47
|
y: top
|
|
48
48
|
} = currentLayout.value;
|
|
49
49
|
const topValue = top;
|
|
50
|
-
return (0, _reactNativeReanimated.interpolate)(animatedY.value, [0, topValue, topValue + stickyHeight +
|
|
50
|
+
return (0, _reactNativeReanimated.interpolate)(animatedY.value, [0, topValue, topValue + stickyHeight + 100000], [0, 0, stickyHeight + 100000], _reactNativeReanimated.Extrapolate.CLAMP);
|
|
51
51
|
}, []);
|
|
52
52
|
const animatedStyle = (0, _reactNativeReanimated.useAnimatedStyle)(() => {
|
|
53
53
|
return {
|
|
@@ -60,7 +60,7 @@ function StickyView(_ref) {
|
|
|
60
60
|
key: key
|
|
61
61
|
// @ts-ignore
|
|
62
62
|
,
|
|
63
|
-
ref:
|
|
63
|
+
ref: stickyRef,
|
|
64
64
|
onLayout: handleLayout,
|
|
65
65
|
style: [styles.container, style, animatedStyle],
|
|
66
66
|
pointerEvents: "box-none"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_reactNativeReanimated","_useCollapsibleHeaderContext","_interopRequireDefault","obj","__esModule","default","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","stickyKey","StickyView","_ref","children","style","
|
|
1
|
+
{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_reactNativeReanimated","_useCollapsibleHeaderContext","_interopRequireDefault","obj","__esModule","default","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","stickyKey","StickyView","_ref","children","style","stickyRef","useMemo","handleStickyViewLayout","animatedY","useCollapsibleHeaderContext","currentLayout","useSharedValue","undefined","useEffect","handleLayout","useCallback","_ref2","nativeEvent","layout","value","translateY","useDerivedValue","height","stickyHeight","y","top","topValue","interpolate","Extrapolate","CLAMP","animatedStyle","useAnimatedStyle","transform","createElement","View","ref","onLayout","styles","container","pointerEvents","StyleSheet","create","backgroundColor","zIndex"],"sourceRoot":"../../../../src","sources":["components/header/StickyView.tsx"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAOA,IAAAE,sBAAA,GAAAH,uBAAA,CAAAC,OAAA;AAOA,IAAAG,4BAAA,GAAAC,sBAAA,CAAAJ,OAAA;AAAkF,SAAAI,uBAAAC,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAV,wBAAAM,GAAA,EAAAI,WAAA,SAAAA,WAAA,IAAAJ,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAQ,KAAA,GAAAL,wBAAA,CAAAC,WAAA,OAAAI,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAT,GAAA,YAAAQ,KAAA,CAAAE,GAAA,CAAAV,GAAA,SAAAW,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAhB,GAAA,QAAAgB,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAnB,GAAA,EAAAgB,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAf,GAAA,EAAAgB,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAhB,GAAA,CAAAgB,GAAA,SAAAL,MAAA,CAAAT,OAAA,GAAAF,GAAA,MAAAQ,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAArB,GAAA,EAAAW,MAAA,YAAAA,MAAA;AAhBlF;;AAwBA,IAAIW,SAAS,GAAG,CAAC;AAEF,SAASC,UAAUA,CAAAC,IAAA,EAAwC;EAAA,IAAvC;IAAEC,QAAQ;IAAEC,KAAK;IAAEC;EAAiB,CAAC,GAAAH,IAAA;EACtE,MAAMR,GAAG,GAAG,IAAAY,cAAO,EAAC,MAAO,UAASN,SAAS,EAAG,EAAC,EAAE,EAAE,CAAC;EACtD,MAAM;IAAEO,sBAAsB;IAAEC;EAAU,CAAC,GAAG,IAAAC,oCAA2B,EAAC,CAAC;EAC3E,MAAMC,aAAa,GAAG,IAAAC,qCAAc,EAA8BC,SAAS,CAAC;EAE5E,IAAAC,gBAAS,EAAC,MAAM;IACd,OAAO,MAAMN,sBAAsB,CAACb,GAAG,EAAEkB,SAAS,CAAC;EACrD,CAAC,EAAE,CAAClB,GAAG,CAAC,CAAC;EAET,MAAMoB,YAAY,GAAG,IAAAC,kBAAW,EAC9BC,KAAA,IAAoD;IAAA,IAAnD;MAAEC,WAAW,EAAE;QAAEC;MAAO;IAAqB,CAAC,GAAAF,KAAA;IAC7CN,aAAa,CAACS,KAAK,GAAGD,MAAM;IAC5BX,sBAAsB,CAACb,GAAG,EAAEwB,MAAM,CAAC;EACrC,CAAC,EACD,CAACxB,GAAG,EAAEa,sBAAsB,CAC9B,CAAC;EAED,MAAMa,UAAU,GAAG,IAAAC,sCAAe,EAAC,MAAM;IACvC,IAAI,CAACX,aAAa,CAACS,KAAK,EAAE;MACxB,OAAO,CAAC;IACV;IACA,MAAM;MAAEG,MAAM,EAAEC,YAAY;MAAEC,CAAC,EAAEC;IAAI,CAAC,GAAGf,aAAa,CAACS,KAAK;IAC5D,MAAMO,QAAQ,GAAGD,GAAG;IAEpB,OAAO,IAAAE,kCAAW,EAChBnB,SAAS,CAACW,KAAK,EACf,CAAC,CAAC,EAAEO,QAAQ,EAAEA,QAAQ,GAAGH,YAAY,GAAG,MAAM,CAAC,EAC/C,CAAC,CAAC,EAAE,CAAC,EAAEA,YAAY,GAAG,MAAM,CAAC,EAC7BK,kCAAW,CAACC,KACd,CAAC;EACH,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMC,aAAa,GAAG,IAAAC,uCAAgB,EAAC,MAAM;IAC3C,OAAO;MACLC,SAAS,EAAE,CACT;QACEZ,UAAU,EAAEA,UAAU,CAACD;MACzB,CAAC;IAEL,CAAC;EACH,CAAC,EAAE,EAAE,CAAC;EAEN,oBACEhD,MAAA,CAAAS,OAAA,CAAAqD,aAAA,CAAC1D,sBAAA,CAAAK,OAAQ,CAACsD,IAAI;IACZxC,GAAG,EAAEA;IACL;IAAA;IACAyC,GAAG,EAAE9B,SAAU;IACf+B,QAAQ,EAAEtB,YAAa;IACvBV,KAAK,EAAE,CAACiC,MAAM,CAACC,SAAS,EAAElC,KAAK,EAAE0B,aAAa,CAAE;IAChDS,aAAa,EAAC;EAAU,GAEvBpC,QACY,CAAC;AAEpB;AAEA,MAAMkC,MAAM,GAAGG,uBAAU,CAACC,MAAM,CAAC;EAC/BH,SAAS,EAAE;IACTI,eAAe,EAAE,OAAO;IACxBC,MAAM,EAAE;EACV;AACF,CAAC,CAAC"}
|
|
@@ -20,6 +20,7 @@ function withCollapsibleContext(Component) {
|
|
|
20
20
|
const fixedHeaderHeight = (0, _reactNativeReanimated.useSharedValue)(0);
|
|
21
21
|
const containerHeight = (0, _reactNativeReanimated.useSharedValue)(0);
|
|
22
22
|
const scrollViewRef = (0, _react.useRef)(null);
|
|
23
|
+
const containerRef = (0, _react.useRef)(null);
|
|
23
24
|
const headerContainerLayouts = (0, _react.useRef)({});
|
|
24
25
|
const headerViewPositions = (0, _reactNativeReanimated.useSharedValue)({});
|
|
25
26
|
const setCollapsibleHandlers = (0, _react.useCallback)(handlers => {
|
|
@@ -60,34 +61,59 @@ function withCollapsibleContext(Component) {
|
|
|
60
61
|
const handleContainerHeight = (0, _react.useCallback)(height => {
|
|
61
62
|
containerHeight.value = height;
|
|
62
63
|
}, []);
|
|
64
|
+
const handleScrollToView = (0, _react.useCallback)((ref, animated) => {
|
|
65
|
+
ref.current.measureLayout(containerRef.current, (_left, top, _width, _height) => {
|
|
66
|
+
var _collapsibleHandlers$;
|
|
67
|
+
const headerContainers = Object.keys(headerContainerLayouts.current).filter(k => {
|
|
68
|
+
const layout = headerContainerLayouts.current[k];
|
|
69
|
+
if (layout) {
|
|
70
|
+
return layout.y + layout.height < top;
|
|
71
|
+
}
|
|
72
|
+
return false;
|
|
73
|
+
});
|
|
74
|
+
const stickyHeightAbove = headerContainers.reduce((acc, key) => {
|
|
75
|
+
const layout = headerContainerLayouts.current[key];
|
|
76
|
+
acc += (layout === null || layout === void 0 ? void 0 : layout.stickyHeight) ?? 0;
|
|
77
|
+
return acc;
|
|
78
|
+
}, 0);
|
|
79
|
+
console.log({
|
|
80
|
+
top,
|
|
81
|
+
stickyHeightAbove
|
|
82
|
+
});
|
|
83
|
+
//
|
|
84
|
+
(_collapsibleHandlers$ = collapsibleHandlers.current) === null || _collapsibleHandlers$ === void 0 ? void 0 : _collapsibleHandlers$.scrollTo(top - stickyHeightAbove, animated);
|
|
85
|
+
}, () => {});
|
|
86
|
+
}, []);
|
|
63
87
|
const context = (0, _react.useMemo)(() => {
|
|
64
88
|
return {
|
|
65
89
|
collapse: animated => {
|
|
66
|
-
var _collapsibleHandlers
|
|
67
|
-
return (_collapsibleHandlers$ = collapsibleHandlers.current) === null || _collapsibleHandlers$ === void 0 ? void 0 : _collapsibleHandlers
|
|
90
|
+
var _collapsibleHandlers$2;
|
|
91
|
+
return (_collapsibleHandlers$2 = collapsibleHandlers.current) === null || _collapsibleHandlers$2 === void 0 ? void 0 : _collapsibleHandlers$2.collapse(animated);
|
|
68
92
|
},
|
|
69
93
|
expand: () => {
|
|
70
|
-
var _collapsibleHandlers$
|
|
71
|
-
return (_collapsibleHandlers$
|
|
94
|
+
var _collapsibleHandlers$3;
|
|
95
|
+
return (_collapsibleHandlers$3 = collapsibleHandlers.current) === null || _collapsibleHandlers$3 === void 0 ? void 0 : _collapsibleHandlers$3.expand();
|
|
72
96
|
},
|
|
73
97
|
scrollTo: (offset, animate) => {
|
|
74
|
-
var _collapsibleHandlers$
|
|
75
|
-
return (_collapsibleHandlers$
|
|
98
|
+
var _collapsibleHandlers$4;
|
|
99
|
+
return (_collapsibleHandlers$4 = collapsibleHandlers.current) === null || _collapsibleHandlers$4 === void 0 ? void 0 : _collapsibleHandlers$4.scrollTo(offset, animate);
|
|
76
100
|
},
|
|
77
101
|
scrollToIndex: params => {
|
|
78
|
-
var _collapsibleHandlers$
|
|
79
|
-
return (_collapsibleHandlers$
|
|
102
|
+
var _collapsibleHandlers$5;
|
|
103
|
+
return (_collapsibleHandlers$5 = collapsibleHandlers.current) === null || _collapsibleHandlers$5 === void 0 ? void 0 : _collapsibleHandlers$5.scrollToIndex(params);
|
|
80
104
|
},
|
|
81
105
|
scrollToLocation: params => {
|
|
82
|
-
var _collapsibleHandlers$
|
|
83
|
-
return (_collapsibleHandlers$
|
|
106
|
+
var _collapsibleHandlers$6;
|
|
107
|
+
return (_collapsibleHandlers$6 = collapsibleHandlers.current) === null || _collapsibleHandlers$6 === void 0 ? void 0 : _collapsibleHandlers$6.scrollToLocation(params);
|
|
84
108
|
},
|
|
85
109
|
headerHeight,
|
|
86
110
|
scrollY,
|
|
87
|
-
headerCollapsed
|
|
111
|
+
headerCollapsed,
|
|
112
|
+
scrollToView: handleScrollToView
|
|
88
113
|
};
|
|
89
|
-
}, [scrollY, headerHeight, headerCollapsed]);
|
|
114
|
+
}, [scrollY, headerHeight, headerCollapsed, handleScrollToView]);
|
|
90
115
|
const internalContext = (0, _react.useMemo)(() => ({
|
|
116
|
+
containerRef,
|
|
91
117
|
scrollViewRef,
|
|
92
118
|
handleHeaderContainerLayout,
|
|
93
119
|
setCollapsibleHandlers,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireWildcard","require","_useCollapsibleContext","_useInternalCollapsibleContext","_reactNativeReanimated","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","withCollapsibleContext","Component","props","collapsibleHandlers","useRef","headerHeight","useSharedValue","scrollY","fixedHeaderHeight","containerHeight","scrollViewRef","headerContainerLayouts","headerViewPositions","setCollapsibleHandlers","useCallback","handlers","current","headerCollapsed","useDerivedValue","maxY","value","contentMinHeight","handleHeaderContainerLayout","layout","stickyHeight","undefined","headerContainers","keys","filter","k","sortedHeaders","sort","a","b","_headerContainerLayou","_headerContainerLayou2","y","values","aStickyHeight","index","length","_headerContainerLayou3","headerKey","sHeight","top","handleContainerHeight","height","
|
|
1
|
+
{"version":3,"names":["_react","_interopRequireWildcard","require","_useCollapsibleContext","_useInternalCollapsibleContext","_reactNativeReanimated","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","withCollapsibleContext","Component","props","collapsibleHandlers","useRef","headerHeight","useSharedValue","scrollY","fixedHeaderHeight","containerHeight","scrollViewRef","containerRef","headerContainerLayouts","headerViewPositions","setCollapsibleHandlers","useCallback","handlers","current","headerCollapsed","useDerivedValue","maxY","value","contentMinHeight","handleHeaderContainerLayout","layout","stickyHeight","undefined","headerContainers","keys","filter","k","sortedHeaders","sort","a","b","_headerContainerLayou","_headerContainerLayou2","y","values","aStickyHeight","index","length","_headerContainerLayou3","headerKey","sHeight","top","handleContainerHeight","height","handleScrollToView","ref","animated","measureLayout","_left","_width","_height","_collapsibleHandlers$","stickyHeightAbove","reduce","acc","console","log","scrollTo","context","useMemo","collapse","_collapsibleHandlers$2","expand","_collapsibleHandlers$3","offset","animate","_collapsibleHandlers$4","scrollToIndex","params","_collapsibleHandlers$5","scrollToLocation","_collapsibleHandlers$6","scrollToView","internalContext","createElement","CollapsibleContext","Provider","InternalCollapsibleContext"],"sourceRoot":"../../src","sources":["withCollapsibleContext.tsx"],"mappings":"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"}
|
|
@@ -13,9 +13,9 @@ export default function CollapsibleContainer(_ref) {
|
|
|
13
13
|
textInputRefs = [],
|
|
14
14
|
...props
|
|
15
15
|
} = _ref;
|
|
16
|
-
const containerRef = useRef(null);
|
|
17
16
|
const {
|
|
18
|
-
handleContainerHeight
|
|
17
|
+
handleContainerHeight,
|
|
18
|
+
containerRef
|
|
19
19
|
} = useInternalCollapsibleContext();
|
|
20
20
|
const {
|
|
21
21
|
scrollY,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useCallback","useRef","KeyboardAvoidingView","StyleSheet","View","useKeyboardShowEvent","useInternalCollapsibleContext","useCollapsibleContext","CollapsibleHeaderConsumer","CollapsibleContainer","_ref","children","keyboardAvoidingViewProps","textInputRefs","props","
|
|
1
|
+
{"version":3,"names":["React","useCallback","useRef","KeyboardAvoidingView","StyleSheet","View","useKeyboardShowEvent","useInternalCollapsibleContext","useCollapsibleContext","CollapsibleHeaderConsumer","CollapsibleContainer","_ref","children","keyboardAvoidingViewProps","textInputRefs","props","handleContainerHeight","containerRef","scrollY","scrollTo","containerHeight","some","ref","isFocusedFunc","current","isFocused","measureLayout","_left","top","_width","height","value","extraOffset","keyboardVerticalOffset","handleContainerLayout","layout","nativeEvent","createElement","_extends","style","styles","container","behavior","onLayout","collapsable","create","flex","overflow"],"sourceRoot":"../../../src","sources":["components/CollapsibleContainer.tsx"],"mappings":";AAAA;AACA,OAAOA,KAAK,IAAIC,WAAW,EAAEC,MAAM,QAAQ,OAAO;AAClD,SACEC,oBAAoB,EAGpBC,UAAU,EACVC,IAAI,QAEC,cAAc;AACrB,OAAOC,oBAAoB,MAAM,+BAA+B;AAChE,OAAOC,6BAA6B,MAAM,wCAAwC;AAClF,OAAOC,qBAAqB,MAAM,gCAAgC;AAClE,OAAOC,yBAAyB,MAAM,oCAAoC;AAQ1E,eAAe,SAASC,oBAAoBA,CAAAC,IAAA,EAKlC;EAAA,IALmC;IAC3CC,QAAQ;IACRC,yBAAyB;IACzBC,aAAa,GAAG,EAAE;IAClB,GAAGC;EACE,CAAC,GAAAJ,IAAA;EACN,MAAM;IAAEK,qBAAqB;IAAEC;EAAa,CAAC,GAC3CV,6BAA6B,CAAC,CAAC;EACjC,MAAM;IAAEW,OAAO;IAAEC;EAAS,CAAC,GAAGX,qBAAqB,CAAC,CAAC;EAErD,MAAMY,eAAe,GAAGlB,MAAM,CAAC,CAAC,CAAC;EAEjCI,oBAAoB,CAAC,MAAM;IACzBQ,aAAa,CAACO,IAAI,CAAEC,GAAG,IAAK;MAC1B,MAAMC,aAAa,GAAGD,GAAG,CAACE,OAAO,CAACC,SAAS;MAC3C,MAAMA,SAAS,GACbF,aAAa,IAAI,OAAOA,aAAa,KAAK,UAAU,GAChDA,aAAa,CAAC,CAAC,GACfA,aAAa;MACnB,IAAIE,SAAS,EAAE;QACbH,GAAG,CAACE,OAAO,CAACE,aAAa;QACvB;QACAT,YAAY,CAACO,OAAO,EACpB,CAACG,KAAa,EAAEC,GAAW,EAAEC,MAAc,EAAEC,MAAc,KAAK;UAC9D,IAAIF,GAAG,GAAGE,MAAM,GAAGZ,OAAO,CAACa,KAAK,GAAGX,eAAe,CAACI,OAAO,EAAE;YAC1D,MAAMQ,WAAW,GACf,CAAAnB,yBAAyB,aAAzBA,yBAAyB,uBAAzBA,yBAAyB,CAAEoB,sBAAsB,KAAI,EAAE;YACzDd,QAAQ,CAACS,GAAG,GAAGE,MAAM,GAAGE,WAAW,GAAGZ,eAAe,CAACI,OAAO,CAAC;UAChE;QACF,CAAC,EACD,MAAM,CAAC,CACT,CAAC;MACH;MACA,OAAOC,SAAS;IAClB,CAAC,CAAC;EACJ,CAAC,CAAC;EAEF,MAAMS,qBAAqB,GAAGjC,WAAW,CAAEkC,MAAyB,IAAK;IACvE,MAAML,MAAM,GAAGK,MAAM,CAACC,WAAW,CAACD,MAAM,CAACL,MAAM;IAC/CV,eAAe,CAACI,OAAO,GAAGM,MAAM;IAChCd,qBAAqB,CAACc,MAAM,CAAC;EAC/B,CAAC,EAAE,EAAE,CAAC;EAEN,oBACE9B,KAAA,CAAAqC,aAAA,CAAClC,oBAAoB,EAAAmC,QAAA;IACnBC,KAAK,EAAEC,MAAM,CAACC,SAAU;IACxBC,QAAQ,EAAC;EAAS,GACd7B,yBAAyB,gBAE7Bb,KAAA,CAAAqC,aAAA,CAAChC,IAAI,EAAAiC,QAAA,KACCvB,KAAK;IACTO,GAAG,EAAEL,YAAa;IAClBsB,KAAK,EAAE,CAACC,MAAM,CAACC,SAAS,EAAE1B,KAAK,CAACwB,KAAK,CAAE;IACvCI,QAAQ,EAAET,qBAAsB;IAChCU,WAAW,EAAE;EAAM,iBAEnB5C,KAAA,CAAAqC,aAAA,CAAC5B,yBAAyB,QAAEG,QAAoC,CAC5D,CACc,CAAC;AAE3B;AAEA,MAAM4B,MAAM,GAAGpC,UAAU,CAACyC,MAAM,CAAC;EAC/BJ,SAAS,EAAE;IACTK,IAAI,EAAE,CAAC;IACPC,QAAQ,EAAE;EACZ;AACF,CAAC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/* eslint-disable react-hooks/exhaustive-deps */
|
|
2
|
-
import React, { useCallback, useEffect, useMemo
|
|
2
|
+
import React, { useCallback, useEffect, useMemo } from 'react';
|
|
3
3
|
import { StyleSheet } from 'react-native';
|
|
4
4
|
import Animated, { Extrapolate, interpolate, useAnimatedStyle, useDerivedValue, useSharedValue } from 'react-native-reanimated';
|
|
5
5
|
import useCollapsibleHeaderContext from '../../hooks/useCollapsibleHeaderContext';
|
|
@@ -7,10 +7,10 @@ let stickyKey = 0;
|
|
|
7
7
|
export default function StickyView(_ref) {
|
|
8
8
|
let {
|
|
9
9
|
children,
|
|
10
|
-
style
|
|
10
|
+
style,
|
|
11
|
+
stickyRef
|
|
11
12
|
} = _ref;
|
|
12
13
|
const key = useMemo(() => `sticky_${stickyKey++}`, []);
|
|
13
|
-
const viewRef = useRef(null);
|
|
14
14
|
const {
|
|
15
15
|
handleStickyViewLayout,
|
|
16
16
|
animatedY
|
|
@@ -37,7 +37,7 @@ export default function StickyView(_ref) {
|
|
|
37
37
|
y: top
|
|
38
38
|
} = currentLayout.value;
|
|
39
39
|
const topValue = top;
|
|
40
|
-
return interpolate(animatedY.value, [0, topValue, topValue + stickyHeight +
|
|
40
|
+
return interpolate(animatedY.value, [0, topValue, topValue + stickyHeight + 100000], [0, 0, stickyHeight + 100000], Extrapolate.CLAMP);
|
|
41
41
|
}, []);
|
|
42
42
|
const animatedStyle = useAnimatedStyle(() => {
|
|
43
43
|
return {
|
|
@@ -50,7 +50,7 @@ export default function StickyView(_ref) {
|
|
|
50
50
|
key: key
|
|
51
51
|
// @ts-ignore
|
|
52
52
|
,
|
|
53
|
-
ref:
|
|
53
|
+
ref: stickyRef,
|
|
54
54
|
onLayout: handleLayout,
|
|
55
55
|
style: [styles.container, style, animatedStyle],
|
|
56
56
|
pointerEvents: "box-none"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useCallback","useEffect","useMemo","
|
|
1
|
+
{"version":3,"names":["React","useCallback","useEffect","useMemo","StyleSheet","Animated","Extrapolate","interpolate","useAnimatedStyle","useDerivedValue","useSharedValue","useCollapsibleHeaderContext","stickyKey","StickyView","_ref","children","style","stickyRef","key","handleStickyViewLayout","animatedY","currentLayout","undefined","handleLayout","_ref2","nativeEvent","layout","value","translateY","height","stickyHeight","y","top","topValue","CLAMP","animatedStyle","transform","createElement","View","ref","onLayout","styles","container","pointerEvents","create","backgroundColor","zIndex"],"sourceRoot":"../../../../src","sources":["components/header/StickyView.tsx"],"mappings":"AAAA;AACA,OAAOA,KAAK,IAAIC,WAAW,EAAEC,SAAS,EAAEC,OAAO,QAAQ,OAAO;AAC9D,SAIEC,UAAU,QAEL,cAAc;AACrB,OAAOC,QAAQ,IACbC,WAAW,EACXC,WAAW,EACXC,gBAAgB,EAChBC,eAAe,EACfC,cAAc,QACT,yBAAyB;AAChC,OAAOC,2BAA2B,MAAM,yCAAyC;AAQjF,IAAIC,SAAS,GAAG,CAAC;AAEjB,eAAe,SAASC,UAAUA,CAAAC,IAAA,EAAwC;EAAA,IAAvC;IAAEC,QAAQ;IAAEC,KAAK;IAAEC;EAAiB,CAAC,GAAAH,IAAA;EACtE,MAAMI,GAAG,GAAGf,OAAO,CAAC,MAAO,UAASS,SAAS,EAAG,EAAC,EAAE,EAAE,CAAC;EACtD,MAAM;IAAEO,sBAAsB;IAAEC;EAAU,CAAC,GAAGT,2BAA2B,CAAC,CAAC;EAC3E,MAAMU,aAAa,GAAGX,cAAc,CAA8BY,SAAS,CAAC;EAE5EpB,SAAS,CAAC,MAAM;IACd,OAAO,MAAMiB,sBAAsB,CAACD,GAAG,EAAEI,SAAS,CAAC;EACrD,CAAC,EAAE,CAACJ,GAAG,CAAC,CAAC;EAET,MAAMK,YAAY,GAAGtB,WAAW,CAC9BuB,KAAA,IAAoD;IAAA,IAAnD;MAAEC,WAAW,EAAE;QAAEC;MAAO;IAAqB,CAAC,GAAAF,KAAA;IAC7CH,aAAa,CAACM,KAAK,GAAGD,MAAM;IAC5BP,sBAAsB,CAACD,GAAG,EAAEQ,MAAM,CAAC;EACrC,CAAC,EACD,CAACR,GAAG,EAAEC,sBAAsB,CAC9B,CAAC;EAED,MAAMS,UAAU,GAAGnB,eAAe,CAAC,MAAM;IACvC,IAAI,CAACY,aAAa,CAACM,KAAK,EAAE;MACxB,OAAO,CAAC;IACV;IACA,MAAM;MAAEE,MAAM,EAAEC,YAAY;MAAEC,CAAC,EAAEC;IAAI,CAAC,GAAGX,aAAa,CAACM,KAAK;IAC5D,MAAMM,QAAQ,GAAGD,GAAG;IAEpB,OAAOzB,WAAW,CAChBa,SAAS,CAACO,KAAK,EACf,CAAC,CAAC,EAAEM,QAAQ,EAAEA,QAAQ,GAAGH,YAAY,GAAG,MAAM,CAAC,EAC/C,CAAC,CAAC,EAAE,CAAC,EAAEA,YAAY,GAAG,MAAM,CAAC,EAC7BxB,WAAW,CAAC4B,KACd,CAAC;EACH,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMC,aAAa,GAAG3B,gBAAgB,CAAC,MAAM;IAC3C,OAAO;MACL4B,SAAS,EAAE,CACT;QACER,UAAU,EAAEA,UAAU,CAACD;MACzB,CAAC;IAEL,CAAC;EACH,CAAC,EAAE,EAAE,CAAC;EAEN,oBACE3B,KAAA,CAAAqC,aAAA,CAAChC,QAAQ,CAACiC,IAAI;IACZpB,GAAG,EAAEA;IACL;IAAA;IACAqB,GAAG,EAAEtB,SAAU;IACfuB,QAAQ,EAAEjB,YAAa;IACvBP,KAAK,EAAE,CAACyB,MAAM,CAACC,SAAS,EAAE1B,KAAK,EAAEmB,aAAa,CAAE;IAChDQ,aAAa,EAAC;EAAU,GAEvB5B,QACY,CAAC;AAEpB;AAEA,MAAM0B,MAAM,GAAGrC,UAAU,CAACwC,MAAM,CAAC;EAC/BF,SAAS,EAAE;IACTG,eAAe,EAAE,OAAO;IACxBC,MAAM,EAAE;EACV;AACF,CAAC,CAAC"}
|
|
@@ -11,6 +11,7 @@ export default function withCollapsibleContext(Component) {
|
|
|
11
11
|
const fixedHeaderHeight = useSharedValue(0);
|
|
12
12
|
const containerHeight = useSharedValue(0);
|
|
13
13
|
const scrollViewRef = useRef(null);
|
|
14
|
+
const containerRef = useRef(null);
|
|
14
15
|
const headerContainerLayouts = useRef({});
|
|
15
16
|
const headerViewPositions = useSharedValue({});
|
|
16
17
|
const setCollapsibleHandlers = useCallback(handlers => {
|
|
@@ -51,34 +52,59 @@ export default function withCollapsibleContext(Component) {
|
|
|
51
52
|
const handleContainerHeight = useCallback(height => {
|
|
52
53
|
containerHeight.value = height;
|
|
53
54
|
}, []);
|
|
55
|
+
const handleScrollToView = useCallback((ref, animated) => {
|
|
56
|
+
ref.current.measureLayout(containerRef.current, (_left, top, _width, _height) => {
|
|
57
|
+
var _collapsibleHandlers$;
|
|
58
|
+
const headerContainers = Object.keys(headerContainerLayouts.current).filter(k => {
|
|
59
|
+
const layout = headerContainerLayouts.current[k];
|
|
60
|
+
if (layout) {
|
|
61
|
+
return layout.y + layout.height < top;
|
|
62
|
+
}
|
|
63
|
+
return false;
|
|
64
|
+
});
|
|
65
|
+
const stickyHeightAbove = headerContainers.reduce((acc, key) => {
|
|
66
|
+
const layout = headerContainerLayouts.current[key];
|
|
67
|
+
acc += (layout === null || layout === void 0 ? void 0 : layout.stickyHeight) ?? 0;
|
|
68
|
+
return acc;
|
|
69
|
+
}, 0);
|
|
70
|
+
console.log({
|
|
71
|
+
top,
|
|
72
|
+
stickyHeightAbove
|
|
73
|
+
});
|
|
74
|
+
//
|
|
75
|
+
(_collapsibleHandlers$ = collapsibleHandlers.current) === null || _collapsibleHandlers$ === void 0 ? void 0 : _collapsibleHandlers$.scrollTo(top - stickyHeightAbove, animated);
|
|
76
|
+
}, () => {});
|
|
77
|
+
}, []);
|
|
54
78
|
const context = useMemo(() => {
|
|
55
79
|
return {
|
|
56
80
|
collapse: animated => {
|
|
57
|
-
var _collapsibleHandlers
|
|
58
|
-
return (_collapsibleHandlers$ = collapsibleHandlers.current) === null || _collapsibleHandlers$ === void 0 ? void 0 : _collapsibleHandlers
|
|
81
|
+
var _collapsibleHandlers$2;
|
|
82
|
+
return (_collapsibleHandlers$2 = collapsibleHandlers.current) === null || _collapsibleHandlers$2 === void 0 ? void 0 : _collapsibleHandlers$2.collapse(animated);
|
|
59
83
|
},
|
|
60
84
|
expand: () => {
|
|
61
|
-
var _collapsibleHandlers$
|
|
62
|
-
return (_collapsibleHandlers$
|
|
85
|
+
var _collapsibleHandlers$3;
|
|
86
|
+
return (_collapsibleHandlers$3 = collapsibleHandlers.current) === null || _collapsibleHandlers$3 === void 0 ? void 0 : _collapsibleHandlers$3.expand();
|
|
63
87
|
},
|
|
64
88
|
scrollTo: (offset, animate) => {
|
|
65
|
-
var _collapsibleHandlers$
|
|
66
|
-
return (_collapsibleHandlers$
|
|
89
|
+
var _collapsibleHandlers$4;
|
|
90
|
+
return (_collapsibleHandlers$4 = collapsibleHandlers.current) === null || _collapsibleHandlers$4 === void 0 ? void 0 : _collapsibleHandlers$4.scrollTo(offset, animate);
|
|
67
91
|
},
|
|
68
92
|
scrollToIndex: params => {
|
|
69
|
-
var _collapsibleHandlers$
|
|
70
|
-
return (_collapsibleHandlers$
|
|
93
|
+
var _collapsibleHandlers$5;
|
|
94
|
+
return (_collapsibleHandlers$5 = collapsibleHandlers.current) === null || _collapsibleHandlers$5 === void 0 ? void 0 : _collapsibleHandlers$5.scrollToIndex(params);
|
|
71
95
|
},
|
|
72
96
|
scrollToLocation: params => {
|
|
73
|
-
var _collapsibleHandlers$
|
|
74
|
-
return (_collapsibleHandlers$
|
|
97
|
+
var _collapsibleHandlers$6;
|
|
98
|
+
return (_collapsibleHandlers$6 = collapsibleHandlers.current) === null || _collapsibleHandlers$6 === void 0 ? void 0 : _collapsibleHandlers$6.scrollToLocation(params);
|
|
75
99
|
},
|
|
76
100
|
headerHeight,
|
|
77
101
|
scrollY,
|
|
78
|
-
headerCollapsed
|
|
102
|
+
headerCollapsed,
|
|
103
|
+
scrollToView: handleScrollToView
|
|
79
104
|
};
|
|
80
|
-
}, [scrollY, headerHeight, headerCollapsed]);
|
|
105
|
+
}, [scrollY, headerHeight, headerCollapsed, handleScrollToView]);
|
|
81
106
|
const internalContext = useMemo(() => ({
|
|
107
|
+
containerRef,
|
|
82
108
|
scrollViewRef,
|
|
83
109
|
handleHeaderContainerLayout,
|
|
84
110
|
setCollapsibleHandlers,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useCallback","useMemo","useRef","CollapsibleContext","InternalCollapsibleContext","useDerivedValue","useSharedValue","withCollapsibleContext","Component","props","collapsibleHandlers","headerHeight","scrollY","fixedHeaderHeight","containerHeight","scrollViewRef","headerContainerLayouts","headerViewPositions","setCollapsibleHandlers","handlers","current","headerCollapsed","maxY","value","contentMinHeight","handleHeaderContainerLayout","key","layout","stickyHeight","undefined","headerContainers","Object","keys","filter","k","sortedHeaders","sort","a","b","_headerContainerLayou","_headerContainerLayou2","y","values","aStickyHeight","index","length","_headerContainerLayou3","headerKey","sHeight","top","handleContainerHeight","height","
|
|
1
|
+
{"version":3,"names":["React","useCallback","useMemo","useRef","CollapsibleContext","InternalCollapsibleContext","useDerivedValue","useSharedValue","withCollapsibleContext","Component","props","collapsibleHandlers","headerHeight","scrollY","fixedHeaderHeight","containerHeight","scrollViewRef","containerRef","headerContainerLayouts","headerViewPositions","setCollapsibleHandlers","handlers","current","headerCollapsed","maxY","value","contentMinHeight","handleHeaderContainerLayout","key","layout","stickyHeight","undefined","headerContainers","Object","keys","filter","k","sortedHeaders","sort","a","b","_headerContainerLayou","_headerContainerLayou2","y","values","aStickyHeight","index","length","_headerContainerLayou3","headerKey","sHeight","top","handleContainerHeight","height","handleScrollToView","ref","animated","measureLayout","_left","_width","_height","_collapsibleHandlers$","stickyHeightAbove","reduce","acc","console","log","scrollTo","context","collapse","_collapsibleHandlers$2","expand","_collapsibleHandlers$3","offset","animate","_collapsibleHandlers$4","scrollToIndex","params","_collapsibleHandlers$5","scrollToLocation","_collapsibleHandlers$6","scrollToView","internalContext","createElement","Provider"],"sourceRoot":"../../src","sources":["withCollapsibleContext.tsx"],"mappings":"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"}
|
|
@@ -3,7 +3,8 @@ import { StyleProp, ViewStyle } from 'react-native';
|
|
|
3
3
|
type Props = {
|
|
4
4
|
style?: StyleProp<ViewStyle>;
|
|
5
5
|
children: Element;
|
|
6
|
+
stickyRef?: React.MutableRefObject<any>;
|
|
6
7
|
};
|
|
7
|
-
export default function StickyView({ children, style }: Props): React.JSX.Element;
|
|
8
|
+
export default function StickyView({ children, style, stickyRef }: Props): React.JSX.Element;
|
|
8
9
|
export {};
|
|
9
10
|
//# sourceMappingURL=StickyView.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StickyView.d.ts","sourceRoot":"","sources":["../../../../src/components/header/StickyView.tsx"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"StickyView.d.ts","sourceRoot":"","sources":["../../../../src/components/header/StickyView.tsx"],"names":[],"mappings":"AACA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAC/D,OAAO,EAGL,SAAS,EAET,SAAS,EACV,MAAM,cAAc,CAAC;AAUtB,KAAK,KAAK,GAAG;IACX,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;CACzC,CAAC;AAIF,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,KAAK,qBAsDvE"}
|
|
@@ -8,7 +8,16 @@ export type ScrollToIndexParams = {
|
|
|
8
8
|
viewPosition?: number;
|
|
9
9
|
};
|
|
10
10
|
export type CollapsibleHandles = {
|
|
11
|
+
/**
|
|
12
|
+
* Collapse the header by header height
|
|
13
|
+
* @param animated
|
|
14
|
+
* @returns
|
|
15
|
+
*/
|
|
11
16
|
collapse: (animated?: boolean) => void;
|
|
17
|
+
/**
|
|
18
|
+
* Expand header
|
|
19
|
+
* @returns
|
|
20
|
+
*/
|
|
12
21
|
expand: () => void;
|
|
13
22
|
scrollTo: (offset: number, animate?: boolean) => void;
|
|
14
23
|
scrollToIndex: (params: ScrollToIndexParams) => void;
|
|
@@ -18,6 +27,13 @@ export type CollapsibleContextType = CollapsibleHandles & {
|
|
|
18
27
|
scrollY: Animated.SharedValue<number>;
|
|
19
28
|
headerHeight: Animated.SharedValue<number>;
|
|
20
29
|
headerCollapsed: Animated.SharedValue<boolean>;
|
|
30
|
+
/**
|
|
31
|
+
* Scroll to specific view
|
|
32
|
+
* @param ref View that you want to scroll to
|
|
33
|
+
* @param animated
|
|
34
|
+
* @returns
|
|
35
|
+
*/
|
|
36
|
+
scrollToView: (ref: React.RefObject<any>, animated?: boolean) => void;
|
|
21
37
|
};
|
|
22
38
|
export type LayoutParams = {
|
|
23
39
|
top: number;
|
|
@@ -27,6 +43,7 @@ export type LayoutParams = {
|
|
|
27
43
|
};
|
|
28
44
|
export type CollapsibleContextInternalType = {
|
|
29
45
|
scrollViewRef: React.RefObject<any>;
|
|
46
|
+
containerRef: React.RefObject<any>;
|
|
30
47
|
contentMinHeight: Animated.SharedValue<number>;
|
|
31
48
|
headerViewPositions: Animated.SharedValue<Record<string, {
|
|
32
49
|
top: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAC7E,OAAO,KAAK,QAAQ,MAAM,yBAAyB,CAAC;AAEpD,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,CAAC,QAAQ,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACvC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACtD,aAAa,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACrD,gBAAgB,EAAE,CAAC,MAAM,EAAE,uBAAuB,KAAK,IAAI,CAAC;CAC7D,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,kBAAkB,GAAG;IACxD,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACtC,YAAY,EAAE,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC3C,eAAe,EAAE,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAC7E,OAAO,KAAK,QAAQ,MAAM,yBAAyB,CAAC;AAEpD,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B;;;;OAIG;IACH,QAAQ,EAAE,CAAC,QAAQ,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACvC;;;OAGG;IACH,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACtD,aAAa,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACrD,gBAAgB,EAAE,CAAC,MAAM,EAAE,uBAAuB,KAAK,IAAI,CAAC;CAC7D,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,kBAAkB,GAAG;IACxD,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACtC,YAAY,EAAE,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC3C,eAAe,EAAE,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC/C;;;;;OAKG;IACH,YAAY,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;CACvE,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACpC,YAAY,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACnC,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC/C,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CACvC,MAAM,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC,CACtD,CAAC;IACF,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAChD,YAAY,EAAE,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC3C,qBAAqB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,2BAA2B,EAAE,CAC3B,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,eAAe,EACxB,YAAY,CAAC,EAAE,MAAM,KAClB,IAAI,CAAC;IACV,sBAAsB,EAAE,CAAC,QAAQ,EAAE,kBAAkB,KAAK,IAAI,CAAC;CAChE,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,YAAY,EAAE,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC3C,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAClD,cAAc,EAAE,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;CAC9C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withCollapsibleContext.d.ts","sourceRoot":"","sources":["../../src/withCollapsibleContext.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAgC,EAAE,EAAE,MAAM,OAAO,CAAC;AAOhE,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,WACjD,CAAC,
|
|
1
|
+
{"version":3,"file":"withCollapsibleContext.d.ts","sourceRoot":"","sources":["../../src/withCollapsibleContext.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAgC,EAAE,EAAE,MAAM,OAAO,CAAC;AAOhE,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,WACjD,CAAC,uBAsJjB"}
|
package/package.json
CHANGED
|
@@ -25,8 +25,8 @@ export default function CollapsibleContainer({
|
|
|
25
25
|
textInputRefs = [],
|
|
26
26
|
...props
|
|
27
27
|
}: Props) {
|
|
28
|
-
const containerRef =
|
|
29
|
-
|
|
28
|
+
const { handleContainerHeight, containerRef } =
|
|
29
|
+
useInternalCollapsibleContext();
|
|
30
30
|
const { scrollY, scrollTo } = useCollapsibleContext();
|
|
31
31
|
|
|
32
32
|
const containerHeight = useRef(0);
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
/* eslint-disable react-hooks/exhaustive-deps */
|
|
2
|
-
import React, { useCallback, useEffect, useMemo
|
|
2
|
+
import React, { useCallback, useEffect, useMemo } from 'react';
|
|
3
3
|
import {
|
|
4
4
|
LayoutChangeEvent,
|
|
5
5
|
LayoutRectangle,
|
|
6
6
|
StyleProp,
|
|
7
7
|
StyleSheet,
|
|
8
|
-
View,
|
|
9
8
|
ViewStyle,
|
|
10
9
|
} from 'react-native';
|
|
11
10
|
import Animated, {
|
|
@@ -20,13 +19,13 @@ import useCollapsibleHeaderContext from '../../hooks/useCollapsibleHeaderContext
|
|
|
20
19
|
type Props = {
|
|
21
20
|
style?: StyleProp<ViewStyle>;
|
|
22
21
|
children: Element;
|
|
22
|
+
stickyRef?: React.MutableRefObject<any>;
|
|
23
23
|
};
|
|
24
24
|
|
|
25
25
|
let stickyKey = 0;
|
|
26
26
|
|
|
27
|
-
export default function StickyView({ children, style }: Props) {
|
|
27
|
+
export default function StickyView({ children, style, stickyRef }: Props) {
|
|
28
28
|
const key = useMemo(() => `sticky_${stickyKey++}`, []);
|
|
29
|
-
const viewRef = useRef<View>(null);
|
|
30
29
|
const { handleStickyViewLayout, animatedY } = useCollapsibleHeaderContext();
|
|
31
30
|
const currentLayout = useSharedValue<LayoutRectangle | undefined>(undefined);
|
|
32
31
|
|
|
@@ -51,8 +50,8 @@ export default function StickyView({ children, style }: Props) {
|
|
|
51
50
|
|
|
52
51
|
return interpolate(
|
|
53
52
|
animatedY.value,
|
|
54
|
-
[0, topValue, topValue + stickyHeight +
|
|
55
|
-
[0, 0, stickyHeight +
|
|
53
|
+
[0, topValue, topValue + stickyHeight + 100000],
|
|
54
|
+
[0, 0, stickyHeight + 100000],
|
|
56
55
|
Extrapolate.CLAMP
|
|
57
56
|
);
|
|
58
57
|
}, []);
|
|
@@ -71,7 +70,7 @@ export default function StickyView({ children, style }: Props) {
|
|
|
71
70
|
<Animated.View
|
|
72
71
|
key={key}
|
|
73
72
|
// @ts-ignore
|
|
74
|
-
ref={
|
|
73
|
+
ref={stickyRef}
|
|
75
74
|
onLayout={handleLayout}
|
|
76
75
|
style={[styles.container, style, animatedStyle]}
|
|
77
76
|
pointerEvents="box-none"
|
package/src/types.ts
CHANGED
|
@@ -10,7 +10,16 @@ export type ScrollToIndexParams = {
|
|
|
10
10
|
};
|
|
11
11
|
|
|
12
12
|
export type CollapsibleHandles = {
|
|
13
|
+
/**
|
|
14
|
+
* Collapse the header by header height
|
|
15
|
+
* @param animated
|
|
16
|
+
* @returns
|
|
17
|
+
*/
|
|
13
18
|
collapse: (animated?: boolean) => void;
|
|
19
|
+
/**
|
|
20
|
+
* Expand header
|
|
21
|
+
* @returns
|
|
22
|
+
*/
|
|
14
23
|
expand: () => void;
|
|
15
24
|
scrollTo: (offset: number, animate?: boolean) => void;
|
|
16
25
|
scrollToIndex: (params: ScrollToIndexParams) => void;
|
|
@@ -21,6 +30,13 @@ export type CollapsibleContextType = CollapsibleHandles & {
|
|
|
21
30
|
scrollY: Animated.SharedValue<number>;
|
|
22
31
|
headerHeight: Animated.SharedValue<number>;
|
|
23
32
|
headerCollapsed: Animated.SharedValue<boolean>;
|
|
33
|
+
/**
|
|
34
|
+
* Scroll to specific view
|
|
35
|
+
* @param ref View that you want to scroll to
|
|
36
|
+
* @param animated
|
|
37
|
+
* @returns
|
|
38
|
+
*/
|
|
39
|
+
scrollToView: (ref: React.RefObject<any>, animated?: boolean) => void;
|
|
24
40
|
};
|
|
25
41
|
|
|
26
42
|
export type LayoutParams = {
|
|
@@ -32,6 +48,7 @@ export type LayoutParams = {
|
|
|
32
48
|
|
|
33
49
|
export type CollapsibleContextInternalType = {
|
|
34
50
|
scrollViewRef: React.RefObject<any>;
|
|
51
|
+
containerRef: React.RefObject<any>;
|
|
35
52
|
contentMinHeight: Animated.SharedValue<number>;
|
|
36
53
|
headerViewPositions: Animated.SharedValue<
|
|
37
54
|
Record<string, { top: number; stickyHeight: number }>
|
|
@@ -14,6 +14,7 @@ export default function withCollapsibleContext<T>(Component: FC<T>) {
|
|
|
14
14
|
const fixedHeaderHeight = useSharedValue(0);
|
|
15
15
|
const containerHeight = useSharedValue(0);
|
|
16
16
|
const scrollViewRef = useRef<View>(null);
|
|
17
|
+
const containerRef = useRef<View>(null);
|
|
17
18
|
const headerContainerLayouts = useRef<
|
|
18
19
|
Record<string, (LayoutRectangle & { stickyHeight?: number }) | undefined>
|
|
19
20
|
>({});
|
|
@@ -71,6 +72,41 @@ export default function withCollapsibleContext<T>(Component: FC<T>) {
|
|
|
71
72
|
containerHeight.value = height;
|
|
72
73
|
}, []);
|
|
73
74
|
|
|
75
|
+
const handleScrollToView = useCallback(
|
|
76
|
+
(ref: React.RefObject<any>, animated?: boolean) => {
|
|
77
|
+
ref.current.measureLayout(
|
|
78
|
+
containerRef.current,
|
|
79
|
+
(_left: number, top: number, _width: number, _height: number) => {
|
|
80
|
+
const headerContainers = Object.keys(
|
|
81
|
+
headerContainerLayouts.current
|
|
82
|
+
).filter((k: string) => {
|
|
83
|
+
const layout = headerContainerLayouts.current[k];
|
|
84
|
+
if (layout) {
|
|
85
|
+
return layout.y + layout.height < top;
|
|
86
|
+
}
|
|
87
|
+
return false;
|
|
88
|
+
});
|
|
89
|
+
const stickyHeightAbove = headerContainers.reduce((acc, key) => {
|
|
90
|
+
const layout = headerContainerLayouts.current[key];
|
|
91
|
+
acc += layout?.stickyHeight ?? 0;
|
|
92
|
+
return acc;
|
|
93
|
+
}, 0);
|
|
94
|
+
console.log({
|
|
95
|
+
top,
|
|
96
|
+
stickyHeightAbove,
|
|
97
|
+
});
|
|
98
|
+
//
|
|
99
|
+
collapsibleHandlers.current?.scrollTo(
|
|
100
|
+
top - stickyHeightAbove,
|
|
101
|
+
animated
|
|
102
|
+
);
|
|
103
|
+
},
|
|
104
|
+
() => {}
|
|
105
|
+
);
|
|
106
|
+
},
|
|
107
|
+
[]
|
|
108
|
+
);
|
|
109
|
+
|
|
74
110
|
const context = useMemo(() => {
|
|
75
111
|
return {
|
|
76
112
|
collapse: (animated?: boolean) =>
|
|
@@ -85,11 +121,13 @@ export default function withCollapsibleContext<T>(Component: FC<T>) {
|
|
|
85
121
|
headerHeight,
|
|
86
122
|
scrollY,
|
|
87
123
|
headerCollapsed,
|
|
124
|
+
scrollToView: handleScrollToView,
|
|
88
125
|
};
|
|
89
|
-
}, [scrollY, headerHeight, headerCollapsed]);
|
|
126
|
+
}, [scrollY, headerHeight, headerCollapsed, handleScrollToView]);
|
|
90
127
|
|
|
91
128
|
const internalContext = useMemo(
|
|
92
129
|
() => ({
|
|
130
|
+
containerRef,
|
|
93
131
|
scrollViewRef,
|
|
94
132
|
handleHeaderContainerLayout,
|
|
95
133
|
setCollapsibleHandlers,
|