@a-type/ui 2.0.6 → 2.0.8
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/cjs/components/dialog/Dialog.js +9 -9
- package/dist/cjs/components/dialog/Dialog.js.map +1 -1
- package/dist/cjs/components/forms/FormikForm.d.ts +15 -1
- package/dist/cjs/components/forms/FormikForm.js +17 -3
- package/dist/cjs/components/forms/FormikForm.js.map +1 -1
- package/dist/cjs/components/forms/FormikForm.stories.d.ts +12 -1
- package/dist/cjs/components/forms/TextField.d.ts +4 -2
- package/dist/cjs/components/forms/TextField.js +4 -4
- package/dist/cjs/components/forms/TextField.js.map +1 -1
- package/dist/cjs/components/icon/generated/IconSpritesheet.js +1 -1
- package/dist/cjs/components/icon/generated/IconSpritesheet.js.map +1 -1
- package/dist/cjs/components/icon/generated/iconNames.d.ts +1 -1
- package/dist/cjs/components/icon/generated/iconNames.js +1 -0
- package/dist/cjs/components/icon/generated/iconNames.js.map +1 -1
- package/dist/cjs/components/scrollArea/ScrollArea.d.ts +2 -1
- package/dist/cjs/components/scrollArea/ScrollArea.js +4 -2
- package/dist/cjs/components/scrollArea/ScrollArea.js.map +1 -1
- package/dist/cjs/components/scrollArea/ScrollArea.stories.d.ts +22 -0
- package/dist/cjs/components/scrollArea/ScrollArea.stories.js +28 -0
- package/dist/cjs/components/scrollArea/ScrollArea.stories.js.map +1 -0
- package/dist/cjs/hooks/useStayScrolledToBottom.d.ts +4 -0
- package/dist/cjs/hooks/useStayScrolledToBottom.js +43 -0
- package/dist/cjs/hooks/useStayScrolledToBottom.js.map +1 -0
- package/dist/css/main.css +2 -2
- package/dist/esm/components/dialog/Dialog.js +9 -9
- package/dist/esm/components/dialog/Dialog.js.map +1 -1
- package/dist/esm/components/forms/FormikForm.d.ts +15 -1
- package/dist/esm/components/forms/FormikForm.js +14 -2
- package/dist/esm/components/forms/FormikForm.js.map +1 -1
- package/dist/esm/components/forms/FormikForm.stories.d.ts +12 -1
- package/dist/esm/components/forms/TextField.d.ts +4 -2
- package/dist/esm/components/forms/TextField.js +4 -4
- package/dist/esm/components/forms/TextField.js.map +1 -1
- package/dist/esm/components/icon/generated/IconSpritesheet.js +1 -1
- package/dist/esm/components/icon/generated/IconSpritesheet.js.map +1 -1
- package/dist/esm/components/icon/generated/iconNames.d.ts +1 -1
- package/dist/esm/components/icon/generated/iconNames.js +1 -0
- package/dist/esm/components/icon/generated/iconNames.js.map +1 -1
- package/dist/esm/components/scrollArea/ScrollArea.d.ts +2 -1
- package/dist/esm/components/scrollArea/ScrollArea.js +4 -2
- package/dist/esm/components/scrollArea/ScrollArea.js.map +1 -1
- package/dist/esm/components/scrollArea/ScrollArea.stories.d.ts +22 -0
- package/dist/esm/components/scrollArea/ScrollArea.stories.js +25 -0
- package/dist/esm/components/scrollArea/ScrollArea.stories.js.map +1 -0
- package/dist/esm/hooks/useStayScrolledToBottom.d.ts +4 -0
- package/dist/esm/hooks/useStayScrolledToBottom.js +40 -0
- package/dist/esm/hooks/useStayScrolledToBottom.js.map +1 -0
- package/package.json +1 -1
- package/src/components/dialog/Dialog.tsx +13 -13
- package/src/components/forms/FormikForm.tsx +45 -31
- package/src/components/forms/TextField.tsx +6 -0
- package/src/components/icon/generated/IconSpritesheet.tsx +9 -1
- package/src/components/icon/generated/iconNames.ts +1 -0
- package/src/components/scrollArea/ScrollArea.stories.tsx +63 -0
- package/src/components/scrollArea/ScrollArea.tsx +13 -2
- package/src/hooks/useStayScrolledToBottom.ts +46 -0
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as Primitive from '@radix-ui/react-scroll-area';
|
|
2
2
|
import { Ref } from 'react';
|
|
3
3
|
import { withClassName } from '../../hooks.js';
|
|
4
|
+
import { useStayScrolledToBottom } from '../../hooks/useStayScrolledToBottom.js';
|
|
4
5
|
|
|
5
6
|
const ScrollAreaRootImpl = withClassName(Primitive.Root, 'overflow-hidden');
|
|
6
7
|
|
|
@@ -56,6 +57,7 @@ export interface ScrollAreaProps extends Primitive.ScrollAreaProps {
|
|
|
56
57
|
background?: ScrollAreaRootProps['background'];
|
|
57
58
|
orientation?: 'vertical' | 'both';
|
|
58
59
|
ref?: Ref<HTMLDivElement>;
|
|
60
|
+
stickToBottom?: boolean;
|
|
59
61
|
}
|
|
60
62
|
|
|
61
63
|
export const ScrollArea = Object.assign(
|
|
@@ -63,11 +65,20 @@ export const ScrollArea = Object.assign(
|
|
|
63
65
|
ref,
|
|
64
66
|
children,
|
|
65
67
|
orientation,
|
|
68
|
+
stickToBottom,
|
|
66
69
|
...props
|
|
67
70
|
}: ScrollAreaProps) {
|
|
71
|
+
const { ref: stickRef, onScroll } = useStayScrolledToBottom(stickToBottom);
|
|
72
|
+
|
|
68
73
|
return (
|
|
69
|
-
<ScrollAreaRoot ref={ref} {...props}>
|
|
70
|
-
<ScrollAreaViewport
|
|
74
|
+
<ScrollAreaRoot data-scroll-root ref={ref} {...props}>
|
|
75
|
+
<ScrollAreaViewport
|
|
76
|
+
data-scroll-viewport
|
|
77
|
+
ref={stickRef}
|
|
78
|
+
onScroll={onScroll}
|
|
79
|
+
>
|
|
80
|
+
{children}
|
|
81
|
+
</ScrollAreaViewport>
|
|
71
82
|
<ScrollAreaScrollbar />
|
|
72
83
|
{orientation === 'both' && (
|
|
73
84
|
<ScrollAreaScrollbar orientation="horizontal" />
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import { useCallback, useEffect, useRef, useState } from 'react';
|
|
2
|
+
|
|
3
|
+
export function useStayScrolledToBottom(enabled = true) {
|
|
4
|
+
const ref = useRef<HTMLDivElement>(null);
|
|
5
|
+
// if the div was already scrolled to the bottom,
|
|
6
|
+
// keep it at the bottom when new messages come in
|
|
7
|
+
const [isScrolledToBottom, setIsScrolledToBottom] = useState(true);
|
|
8
|
+
|
|
9
|
+
useEffect(() => {
|
|
10
|
+
if (!ref.current || !enabled) return;
|
|
11
|
+
if (isScrolledToBottom) {
|
|
12
|
+
ref.current.scrollTop = ref.current.scrollHeight;
|
|
13
|
+
}
|
|
14
|
+
const observer = new MutationObserver(() => {
|
|
15
|
+
if (!ref.current) return;
|
|
16
|
+
if (isScrolledToBottom) {
|
|
17
|
+
console.log('scrolling to bottom');
|
|
18
|
+
ref.current.scrollTop = ref.current.scrollHeight;
|
|
19
|
+
}
|
|
20
|
+
});
|
|
21
|
+
observer.observe(ref.current, { childList: true, subtree: true });
|
|
22
|
+
return () => {
|
|
23
|
+
observer.disconnect();
|
|
24
|
+
};
|
|
25
|
+
}, [isScrolledToBottom, ref, enabled]);
|
|
26
|
+
|
|
27
|
+
const onScroll = useCallback(() => {
|
|
28
|
+
if (!ref.current) return;
|
|
29
|
+
const isScrolledToBottom =
|
|
30
|
+
ref.current.scrollTop + ref.current.clientHeight >=
|
|
31
|
+
ref.current.scrollHeight - 10;
|
|
32
|
+
console.log(
|
|
33
|
+
'onScroll',
|
|
34
|
+
ref.current.scrollTop,
|
|
35
|
+
ref.current.clientHeight,
|
|
36
|
+
ref.current.scrollHeight,
|
|
37
|
+
isScrolledToBottom,
|
|
38
|
+
);
|
|
39
|
+
setIsScrolledToBottom(isScrolledToBottom);
|
|
40
|
+
}, []);
|
|
41
|
+
|
|
42
|
+
return {
|
|
43
|
+
ref,
|
|
44
|
+
onScroll,
|
|
45
|
+
};
|
|
46
|
+
}
|