@rvx/ui 0.1.28 → 0.1.29
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/dist/components/scroll-view.d.ts +1 -0
- package/dist/components/scroll-view.d.ts.map +1 -1
- package/dist/components/scroll-view.js +8 -6
- package/dist/components/scroll-view.js.map +1 -1
- package/dist/theme.module.css +2 -2
- package/package.json +1 -1
- package/src/components/scroll-view.tsx +9 -6
- package/src/theme/components/page.scss +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scroll-view.d.ts","sourceRoot":"","sources":["../../src/components/scroll-view.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAK,UAAU,EAAE,UAAU,EAAY,MAAM,KAAK,CAAC;AAO1D,wBAAgB,UAAU,CAAC,KAAK,EAAE;IACjC,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,YAAY,CAAC,EAAE,UAAU,CAAC;IAC1B,YAAY,CAAC,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"scroll-view.d.ts","sourceRoot":"","sources":["../../src/components/scroll-view.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAK,UAAU,EAAE,UAAU,EAAY,MAAM,KAAK,CAAC;AAO1D,wBAAgB,UAAU,CAAC,KAAK,EAAE;IACjC,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,YAAY,CAAC,EAAE,UAAU,CAAC;IAC1B,YAAY,CAAC,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;CACxB,GAAG,OAAO,CA+FV"}
|
|
@@ -7,7 +7,7 @@ const DEBOUNCE_DELAY = 100;
|
|
|
7
7
|
export function ScrollView(props) {
|
|
8
8
|
const theme = THEME.current;
|
|
9
9
|
const vertical = $(undefined);
|
|
10
|
-
const scrollbarComp = $(0);
|
|
10
|
+
const scrollbarComp = props.scrollbarComp ? $(0) : undefined;
|
|
11
11
|
const startIndicator = $(false);
|
|
12
12
|
const endIndicator = $(false);
|
|
13
13
|
const content = _jsx("div", { class: theme?.scroll_view_content, children: props.children });
|
|
@@ -45,7 +45,7 @@ export function ScrollView(props) {
|
|
|
45
45
|
], style: [
|
|
46
46
|
props.style,
|
|
47
47
|
{
|
|
48
|
-
"--scrollbar-comp": () => `${scrollbarComp.value}px
|
|
48
|
+
"--scrollbar-comp": scrollbarComp ? (() => `${scrollbarComp.value}px`) : "initial",
|
|
49
49
|
},
|
|
50
50
|
], children: [area, _jsx("div", { class: [
|
|
51
51
|
theme?.scroll_view_indicator_start,
|
|
@@ -63,12 +63,14 @@ export function ScrollView(props) {
|
|
|
63
63
|
teardown(() => rootObserver.disconnect());
|
|
64
64
|
const intersectUpdateIndicators = debounceEvent(DEBOUNCE_DELAY, updateIndicators);
|
|
65
65
|
const contentObserver = new IntersectionObserver(() => {
|
|
66
|
-
const rootRect = root.getBoundingClientRect();
|
|
67
|
-
const contentRect = content.getBoundingClientRect();
|
|
68
66
|
const blockStart = getBlockStart(getComputedStyle(root).writingMode || "horizontal-tb");
|
|
69
67
|
const isVertical = axisEquals(blockStart, UP);
|
|
70
|
-
|
|
71
|
-
|
|
68
|
+
if (scrollbarComp) {
|
|
69
|
+
const contentRect = content.getBoundingClientRect();
|
|
70
|
+
const rootRect = root.getBoundingClientRect();
|
|
71
|
+
const dir = isVertical ? RIGHT : UP;
|
|
72
|
+
scrollbarComp.value = Math.max(0, getSize(rootRect, dir) - getSize(contentRect, dir));
|
|
73
|
+
}
|
|
72
74
|
vertical.value ??= isVertical;
|
|
73
75
|
intersectUpdateIndicators(blockStart);
|
|
74
76
|
}, { root, rootMargin: "0px 0px 0px 0px", threshold: 1 });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scroll-view.js","sourceRoot":"","sources":["../../src/components/scroll-view.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,CAAC,EAA0B,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAe,MAAM,2BAA2B,CAAC;AAE7G,MAAM,cAAc,GAAG,GAAG,CAAC;AAE3B,MAAM,UAAU,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"scroll-view.js","sourceRoot":"","sources":["../../src/components/scroll-view.tsx"],"names":[],"mappings":"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"}
|
package/dist/theme.module.css
CHANGED
package/package.json
CHANGED
|
@@ -11,10 +11,11 @@ export function ScrollView(props: {
|
|
|
11
11
|
contentClass?: ClassValue;
|
|
12
12
|
contentStyle?: StyleValue;
|
|
13
13
|
children?: unknown;
|
|
14
|
+
scrollbarComp?: boolean;
|
|
14
15
|
}): unknown {
|
|
15
16
|
const theme = THEME.current;
|
|
16
17
|
const vertical = $<boolean | undefined>(undefined);
|
|
17
|
-
const scrollbarComp = $(0);
|
|
18
|
+
const scrollbarComp = props.scrollbarComp ? $(0) : undefined;
|
|
18
19
|
const startIndicator = $(false);
|
|
19
20
|
const endIndicator = $(false);
|
|
20
21
|
|
|
@@ -66,7 +67,7 @@ export function ScrollView(props: {
|
|
|
66
67
|
style={[
|
|
67
68
|
props.style,
|
|
68
69
|
{
|
|
69
|
-
"--scrollbar-comp": () => `${scrollbarComp.value}px
|
|
70
|
+
"--scrollbar-comp": scrollbarComp ? (() => `${scrollbarComp.value}px`) : "initial",
|
|
70
71
|
},
|
|
71
72
|
]}
|
|
72
73
|
>
|
|
@@ -91,12 +92,14 @@ export function ScrollView(props: {
|
|
|
91
92
|
|
|
92
93
|
const intersectUpdateIndicators = debounceEvent(DEBOUNCE_DELAY, updateIndicators);
|
|
93
94
|
const contentObserver = new IntersectionObserver(() => {
|
|
94
|
-
const rootRect = root.getBoundingClientRect();
|
|
95
|
-
const contentRect = content.getBoundingClientRect();
|
|
96
95
|
const blockStart = getBlockStart(getComputedStyle(root).writingMode as WritingMode || "horizontal-tb");
|
|
97
96
|
const isVertical = axisEquals(blockStart, UP);
|
|
98
|
-
|
|
99
|
-
|
|
97
|
+
if (scrollbarComp) {
|
|
98
|
+
const contentRect = content.getBoundingClientRect();
|
|
99
|
+
const rootRect = root.getBoundingClientRect();
|
|
100
|
+
const dir = isVertical ? RIGHT : UP;
|
|
101
|
+
scrollbarComp.value = Math.max(0, getSize(rootRect, dir) - getSize(contentRect, dir));
|
|
102
|
+
}
|
|
100
103
|
vertical.value ??= isVertical;
|
|
101
104
|
intersectUpdateIndicators(blockStart);
|
|
102
105
|
}, { root, rootMargin: "0px 0px 0px 0px", threshold: 1 });
|