reshaped 3.2.5 → 3.2.7
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/CHANGELOG.md +5 -0
- package/dist/bundle.css +1 -1
- package/dist/bundle.js +11 -11
- package/dist/components/Modal/Modal.js +2 -2
- package/dist/components/Modal/Modal.types.d.ts +1 -1
- package/dist/components/Overlay/Overlay.js +5 -2
- package/dist/components/Overlay/Overlay.types.d.ts +2 -0
- package/dist/components/Reshaped/Reshaped.js +5 -1
- package/dist/components/Table/Table.js +4 -3
- package/dist/components/Table/Table.module.css +1 -1
- package/dist/components/Table/Table.types.d.ts +2 -0
- package/dist/components/Table/tests/Table.stories.d.ts +1 -1
- package/dist/components/Table/tests/Table.stories.js +13 -1
- package/dist/components/Tabs/Tabs.module.css +1 -1
- package/dist/components/Tabs/TabsItem.js +16 -10
- package/dist/components/Tabs/TabsList.js +19 -19
- package/dist/components/TextField/TextField.module.css +1 -1
- package/dist/components/Theme/GlobalColorMode.js +11 -6
- package/dist/components/Theme/Theme.context.js +2 -12
- package/dist/components/Theme/Theme.js +6 -6
- package/dist/components/Theme/Theme.types.d.ts +3 -2
- package/dist/components/Theme/Theme.utilities.d.ts +1 -1
- package/dist/components/Theme/Theme.utilities.js +10 -1
- package/dist/components/Theme/tests/Theme.stories.d.ts +1 -0
- package/dist/components/Theme/tests/Theme.stories.js +34 -1
- package/dist/components/Theme/useTheme.d.ts +1 -1
- package/dist/components/Theme/useTheme.js +1 -2
- package/dist/hooks/_private/useSingletonHotkeys.d.ts +3 -3
- package/dist/hooks/_private/useSingletonHotkeys.js +22 -16
- package/dist/hooks/tests/useHotkeys.stories.js +5 -2
- package/dist/hooks/useHotkeys.d.ts +2 -1
- package/dist/utilities/dom/find.d.ts +1 -0
- package/dist/utilities/dom/find.js +9 -0
- package/dist/utilities/dom/index.d.ts +1 -0
- package/dist/utilities/dom/index.js +1 -0
- package/package.json +1 -1
@@ -41,7 +41,7 @@ const ModalSubtitle = (props) => {
|
|
41
41
|
return (_jsx(Text, { variant: "body-3", color: "neutral-faded", attributes: { id: `${id}-subtitle` }, children: children }));
|
42
42
|
};
|
43
43
|
const Modal = (props) => {
|
44
|
-
const { children, onClose, onOpen, active, size, padding = 4, position = "center", overflow, transparentOverlay, blurredOverlay, ariaLabel, autoFocus = true, disableSwipeGesture, disableCloseOnOutsideClick, containerRef, overlayClassName, className, attributes, } = props;
|
44
|
+
const { children, onClose, onOpen, onAfterClose, onAfterOpen, active, size, padding = 4, position = "center", overflow, transparentOverlay, blurredOverlay, ariaLabel, autoFocus = true, disableSwipeGesture, disableCloseOnOutsideClick, containerRef, overlayClassName, className, attributes, } = props;
|
45
45
|
const onCloseRef = useHandlerRef(onClose);
|
46
46
|
const id = useElementId();
|
47
47
|
const clientPosition = useResponsiveClientValue(position);
|
@@ -168,7 +168,7 @@ const Modal = (props) => {
|
|
168
168
|
setHideProgress(progress / 2);
|
169
169
|
dragDistanceRef.current = dragDistance;
|
170
170
|
}, [dragDistance, clientPosition, rootRef]);
|
171
|
-
return (_jsx(Overlay, { onClose: onClose, onOpen: onOpen, disableCloseOnClick: disableCloseOnOutsideClick, active: active, transparent: transparentOverlay || hideProgress, blurred: blurredOverlay, className: overlayClassName, containerRef: containerRef, attributes: {
|
171
|
+
return (_jsx(Overlay, { onClose: onClose, onOpen: onOpen, onAfterClose: onAfterClose, onAfterOpen: onAfterOpen, disableCloseOnClick: disableCloseOnOutsideClick, active: active, transparent: transparentOverlay || hideProgress, blurred: blurredOverlay, className: overlayClassName, containerRef: containerRef, attributes: {
|
172
172
|
onTouchStart: handleDragStart,
|
173
173
|
}, children: ({ active }) => {
|
174
174
|
const rootClassNames = classNames(s.root, className, paddingStyles?.classNames, active && s["--active"], dragging && s["--dragging"], overflow && s[`--overflow-${overflow}`], containerRef && s["--contained"], responsiveClassNames(s, "--position", position));
|
@@ -34,4 +34,4 @@ export type Props = {
|
|
34
34
|
attributes?: G.Attributes<"div"> & {
|
35
35
|
ref?: React.RefObject<HTMLDivElement>;
|
36
36
|
};
|
37
|
-
} & Pick<OverlayProps, "onOpen" | "active" | "containerRef">;
|
37
|
+
} & Pick<OverlayProps, "onOpen" | "onAfterOpen" | "onAfterClose" | "active" | "containerRef">;
|
@@ -13,7 +13,7 @@ import Portal from "../_private/Portal/index.js";
|
|
13
13
|
import s from "./Overlay.module.css";
|
14
14
|
import useHandlerRef from "../../hooks/useHandlerRef.js";
|
15
15
|
const Overlay = (props) => {
|
16
|
-
const { active, children, transparent, blurred, onClose, onOpen, disableCloseOnClick, containerRef, className, attributes, } = props;
|
16
|
+
const { active, children, transparent, blurred, onClose, onOpen, onAfterClose, onAfterOpen, disableCloseOnClick, containerRef, className, attributes, } = props;
|
17
17
|
// Selectors wrapped with refs to simplify working with useEffect dependency array
|
18
18
|
const onCloseRef = useHandlerRef(onClose);
|
19
19
|
const onOpenRef = useHandlerRef(onOpen);
|
@@ -66,10 +66,13 @@ const Overlay = (props) => {
|
|
66
66
|
if (e.propertyName !== "opacity" || e.target !== e.currentTarget)
|
67
67
|
return;
|
68
68
|
setAnimated(false);
|
69
|
-
if (visible)
|
69
|
+
if (visible) {
|
70
|
+
onAfterOpen?.();
|
70
71
|
return;
|
72
|
+
}
|
71
73
|
unlockScroll();
|
72
74
|
remove();
|
75
|
+
onAfterClose?.();
|
73
76
|
};
|
74
77
|
useHotkeys({
|
75
78
|
Escape: () => close({ reason: "escape-key" }),
|
@@ -11,7 +11,9 @@ export type Props = {
|
|
11
11
|
onClose?: (args: {
|
12
12
|
reason: CloseReason;
|
13
13
|
}) => void;
|
14
|
+
onAfterClose?: () => void;
|
14
15
|
onOpen?: () => void;
|
16
|
+
onAfterOpen?: () => void;
|
15
17
|
disableCloseOnClick?: boolean;
|
16
18
|
containerRef?: React.RefObject<HTMLElement>;
|
17
19
|
className?: G.ClassName;
|
@@ -1,8 +1,10 @@
|
|
1
1
|
"use client";
|
2
2
|
import { jsx as _jsx } from "react/jsx-runtime";
|
3
|
+
import React from "react";
|
3
4
|
import { classNames } from "../../utilities/helpers.js";
|
4
5
|
import { GlobalColorMode, PrivateTheme } from "../Theme/index.js";
|
5
6
|
import { ToastProvider } from "../Toast/index.js";
|
7
|
+
import { useGlobalColorMode } from "../Theme/useTheme.js";
|
6
8
|
import useSingletonKeyboardMode from "../../hooks/_private/useSingletonKeyboardMode.js";
|
7
9
|
import { SingletonEnvironmentContext, useSingletonRTL, } from "../../hooks/_private/useSingletonEnvironment.js";
|
8
10
|
import { SingletonHotkeysProvider } from "../../hooks/_private/useSingletonHotkeys.js";
|
@@ -17,6 +19,8 @@ const ReshapedInner = (props) => {
|
|
17
19
|
const Reshaped = (props) => {
|
18
20
|
const { theme, defaultTheme = "reshaped", defaultColorMode, scoped, className } = props;
|
19
21
|
const rootClassNames = classNames(s.root, className);
|
20
|
-
|
22
|
+
const scopeRef = React.useRef(null);
|
23
|
+
const parentGlobalColorMode = useGlobalColorMode();
|
24
|
+
return (_jsx(GlobalColorMode, { defaultMode: defaultColorMode || parentGlobalColorMode.mode || "light", scopeRef: !!parentGlobalColorMode && scoped ? scopeRef : undefined, children: _jsx(PrivateTheme, { name: theme, defaultName: defaultTheme, className: rootClassNames, scoped: scoped, scopeRef: !!parentGlobalColorMode && scoped ? scopeRef : undefined, children: _jsx(ReshapedInner, { ...props, children: props.children }) }) }));
|
21
25
|
};
|
22
26
|
export default Reshaped;
|
@@ -25,9 +25,10 @@ const TableHeading = (props) => {
|
|
25
25
|
return _jsx(TableCellPrivate, { ...props, tagName: "th" });
|
26
26
|
};
|
27
27
|
const TableRow = (props) => {
|
28
|
-
const { highlighted, children, attributes } = props;
|
29
|
-
const
|
30
|
-
|
28
|
+
const { highlighted, children, className, attributes } = props;
|
29
|
+
const onClick = props.onClick || attributes?.onClick;
|
30
|
+
const rowClassNames = classNames(s.row, highlighted && s["--row-highlighted"], className);
|
31
|
+
return (_jsx("tr", { ...attributes, className: rowClassNames, onClick: onClick, tabIndex: onClick ? 0 : undefined, children: children }));
|
31
32
|
};
|
32
33
|
const TableBody = (props) => {
|
33
34
|
const { children, attributes, className } = props;
|
@@ -1 +1 @@
|
|
1
|
-
.root{margin:0 calc(var(--rs-unit-x4) * -1);mask-image:linear-gradient(to right,transparent 0,#000 var(--rs-unit-x4),#000 calc(100% - var(--rs-unit-x4)),transparent 100%);overflow:auto;padding:0 var(--rs-unit-x4)}.table{border-collapse:separate;min-width:100%;overflow:hidden}.row{transition:background-color var(--rs-duration-fast) var(--rs-easing-standard)}.cell{--rs-table-p-vertical-s:3;--rs-table-p-horizontal-s:4;padding:calc(var(--rs-unit-x1) * var(--rs-table-p-vertical-s)) calc(var(--rs-unit-x1) * var(--rs-table-p-horizontal-s));text-align:start;vertical-align:top}.cell:not(:last-child){padding-inline-end:0}.head+.body .row:first-child .cell,.row:not(:first-child) .cell{border-top:1px solid var(--rs-color-border-neutral-faded)}.cell--align-start{text-align:start}.cell--align-center{text-align:center}.cell--align-end{text-align:end}.cell--valign-start{vertical-align:top}.cell--valign-center{vertical-align:middle}.cell--valign-end{vertical-align:bottom}.cell--width-auto{white-space:nowrap}.--row-highlighted{background-color:rgba(var(--rs-color-rgb-background-neutral),32%)}.--border-outer .table{border:1px solid var(--rs-color-border-neutral-faded);border-radius:var(--rs-radius-medium)}.--border-column .cell:not(:first-child){border-inline-start:1px solid var(--rs-color-border-neutral-faded)}.--border-column .cell:not(:last-child){padding-inline-end:calc(var(--rs-unit-x1) * var(--rs-table-p-horizontal-s))}
|
1
|
+
.root{margin:0 calc(var(--rs-unit-x4) * -1);mask-image:linear-gradient(to right,transparent 0,#000 var(--rs-unit-x4),#000 calc(100% - var(--rs-unit-x4)),transparent 100%);overflow:auto;padding:0 var(--rs-unit-x4)}.table{border-collapse:separate;min-width:100%;overflow:hidden}.row{transition:background-color var(--rs-duration-fast) var(--rs-easing-standard)}.row[tabindex]{cursor:pointer}[data-rs-keyboard] .row:focus{box-shadow:var(--rs-focus-inset-shadow);outline:none;z-index:var(--rs-z-index-raised)}.cell{--rs-table-p-vertical-s:3;--rs-table-p-horizontal-s:4;padding:calc(var(--rs-unit-x1) * var(--rs-table-p-vertical-s)) calc(var(--rs-unit-x1) * var(--rs-table-p-horizontal-s));text-align:start;vertical-align:top}.cell:not(:last-child){padding-inline-end:0}.head+.body .row:first-child .cell,.row:not(:first-child) .cell{border-top:1px solid var(--rs-color-border-neutral-faded)}.cell--align-start{text-align:start}.cell--align-center{text-align:center}.cell--align-end{text-align:end}.cell--valign-start{vertical-align:top}.cell--valign-center{vertical-align:middle}.cell--valign-end{vertical-align:bottom}.cell--width-auto{white-space:nowrap}.--row-highlighted{background-color:rgba(var(--rs-color-rgb-background-neutral),32%)}.--border-outer .table{border:1px solid var(--rs-color-border-neutral-faded);border-radius:var(--rs-radius-medium)}.--border-column .cell:not(:first-child){border-inline-start:1px solid var(--rs-color-border-neutral-faded)}.--border-column .cell:not(:last-child){padding-inline-end:calc(var(--rs-unit-x1) * var(--rs-table-p-horizontal-s))}
|
@@ -18,6 +18,6 @@ declare const _default: {
|
|
18
18
|
export default _default;
|
19
19
|
export declare const layout: () => React.JSX.Element;
|
20
20
|
export declare const border: () => React.JSX.Element;
|
21
|
-
export declare const
|
21
|
+
export declare const rows: () => React.JSX.Element;
|
22
22
|
export declare const edgeCases: () => React.JSX.Element;
|
23
23
|
export declare const examples: () => React.JSX.Element;
|
@@ -128,7 +128,7 @@ export const border = () => (<Example>
|
|
128
128
|
</Table>
|
129
129
|
</Example.Item>
|
130
130
|
</Example>);
|
131
|
-
export const
|
131
|
+
export const rows = () => (<Example>
|
132
132
|
<Example.Item title="highlighted for row 2">
|
133
133
|
<Table>
|
134
134
|
<Table.Row>
|
@@ -141,6 +141,18 @@ export const highlighted = () => (<Example>
|
|
141
141
|
</Table.Row>
|
142
142
|
</Table>
|
143
143
|
</Example.Item>
|
144
|
+
<Example.Item title="clickable row 2, focus ring">
|
145
|
+
<Table>
|
146
|
+
<Table.Row>
|
147
|
+
<Table.Heading>Column 1</Table.Heading>
|
148
|
+
<Table.Heading>Column 2</Table.Heading>
|
149
|
+
</Table.Row>
|
150
|
+
<Table.Row onClick={() => { }}>
|
151
|
+
<Table.Cell>Cell 1</Table.Cell>
|
152
|
+
<Table.Cell>Cell 2</Table.Cell>
|
153
|
+
</Table.Row>
|
154
|
+
</Table>
|
155
|
+
</Example.Item>
|
144
156
|
</Example>);
|
145
157
|
export const edgeCases = () => (<Example>
|
146
158
|
<Example.Item title="scroll fade">
|
@@ -1 +1 @@
|
|
1
|
-
@property --rs-tabs-stop-l{syntax:"<
|
1
|
+
@property --rs-tabs-mid-l{syntax:"<length>";initial-value:-24px;inherits:false}@property --rs-tabs-stop-l{syntax:"<length>";initial-value:0;inherits:false}@property --rs-tabs-stop-r{syntax:"<length-percentage>";initial-value:100%;inherits:false}@property --rs-tabs-mid-r{syntax:"<length-percentage>";initial-value:calc(100% + 24px);inherits:false}.root{box-sizing:initial;max-width:100%}.list,.root{position:relative}.list{--rs-tabs-gap:var(--rs-unit-x6);gap:var(--rs-tabs-gap)}.inner{mask-image:linear-gradient(to right,transparent 0,transparent var(--rs-tabs-mid-l),#000 var(--rs-tabs-stop-l),#000 var(--rs-tabs-stop-r),transparent var(--rs-tabs-mid-r),transparent 100%);transition:var(--rs-duration-medium) var(--rs-easing-decelerate);transition-property:--rs-tabs-stop-l,--rs-tabs-stop-r,--rs-tabs-mid-l,--rs-tabs-mid-r}.inner:after{background-color:var(--rs-color-border-neutral-faded);content:"";position:absolute;z-index:2}.listItem{flex-shrink:0;position:relative}.button{overflow:hidden;position:relative;z-index:1;-webkit-tap-highlight-color:transparent}.button,.buttonContent{border-radius:var(--rs-radius-medium);width:100%}.buttonContent{align-items:center;box-sizing:border-box;display:flex}.buttonContent:hover{color:var(--rs-color-foreground-neutral-faded)}.icon{color:inherit;transition:color var(--rs-duration-fast) var(--rs-easing-standard)}[data-rs-keyboard] .radio:focus+.buttonContent{box-shadow:var(--rs-focus-inset-shadow)}.icon:not(:last-child){margin-inline-end:var(--rs-unit-x2)}.--item-active:after{content:""}.--item-active:after,.selector{background:var(--rs-color-border-primary);border-radius:calc(var(--rs-radius-medium) - 1px);position:absolute;z-index:var(--rs-z-index-raised)}.selector{--rs-tab-selection-x:0;--rs-tab-selection-y:0;--rs-tab-selection-scale-x:0;--rs-tab-selection-scale-y:0;transform:translate(calc(var(--rs-tab-selection-x) * 1px),calc(var(--rs-tab-selection-y) * 1px)) translateZ(0);transform-origin:0 0}.--selector-hidden{visibility:hidden}.--selector-animated{transition:var(--rs-duration-medium) var(--rs-easing-decelerate);transition-property:transform,height,width;will-change:transform,height,width}.control{align-items:center;display:none;inset-block:0;opacity:0;pointer-events:none;position:absolute;transition:var(--rs-duration-medium) var(--rs-easing-decelerate);transition-property:opacity,transform;z-index:var(--rs-z-index-raised)}.control.control--active{opacity:1;pointer-events:all;transform:translateX(0)}[dir=rtl] .control{transform:scaleX(-1)}.control--next{inset-inline-end:0;transform:translateX(var(--rs-unit-x2))}.control--prev{inset-inline-start:0;transform:translateX(calc(var(--rs-unit-x2) * -1))}.panel{outline:none}[data-rs-keyboard] .panel:focus{box-shadow:var(--rs-focus-shadow)}.--panel-hidden{display:none}.--direction-row .inner{margin:0 calc(var(--rs-unit-x2) * -1);overflow:auto;padding:0 var(--rs-unit-x2);white-space:nowrap;-ms-overflow-style:none;overflow:-moz-scrollbars-none;scrollbar-width:none}.--direction-row .inner::-webkit-scrollbar{display:none}.--direction-row .inner:after{height:1px;inset-inline:var(--rs-unit-x2);bottom:0}.--direction-row .list{align-items:center;display:inline-flex;flex-wrap:nowrap;vertical-align:top}.--direction-row .--item-active:after{height:2px;inset-inline:0;bottom:0}.--direction-row .selector{bottom:0;height:2px;left:0;width:calc(var(--rs-tab-selection-scale-x) * 1px)}.--direction-row .button{box-sizing:initial;margin:var(--rs-unit-x1) calc(var(--rs-unit-x2) * -1);padding:0 var(--rs-unit-x2)}.--direction-row .buttonContent{justify-content:center;padding:var(--rs-tabs-item-p-v) 0}.--direction-column .inner:after{bottom:0;height:100%;inset-inline-end:0;top:0;width:1px}.--direction-column .list{--rs-tabs-gap:var(--rs-unit-x1);display:flex;flex-direction:column}.--direction-column .item{padding-inline-end:var(--rs-unit-x1)}.--direction-column .--item-active:after{bottom:0}.--direction-column .--item-active:after,.--direction-column .selector{height:100%;inset-inline-end:0;width:2px}.--direction-column .selector{height:calc(var(--rs-tab-selection-scale-y) * 1px);top:0}.--direction-column .button{margin-inline-start:calc(var(--rs-unit-x2) * -1);padding:var(--rs-unit-x2);width:calc(100% + var(--rs-unit-x1))}.--direction-column .buttonContent{justify-content:flex-start}.--variant-borderless .inner:after,.--variant-pills .inner:after,.--variant-pills-elevated .inner:after{content:none}.--variant-pills .button,.--variant-pills-elevated .button{margin:0;padding:0}.--variant-pills .buttonContent,.--variant-pills-elevated .buttonContent{margin:0;padding:var(--rs-tabs-item-p-v) var(--rs-tabs-item-p-h)}.--variant-pills .buttonContent:hover,.--variant-pills-elevated .buttonContent:hover{background:none}.--variant-pills .list,.--variant-pills-elevated .list{--rs-tabs-gap:var(--rs-unit-x1)}.--variant-pills .selector,.--variant-pills-elevated .selector{background-color:var(--rs-color-background-neutral);height:calc(var(--rs-tab-selection-scale-y) * 1px);opacity:.6;width:calc(var(--rs-tab-selection-scale-x) * 1px);z-index:0}.--direction-column.--variant-pills .selector,.--direction-column.--variant-pills-elevated .selector{left:0}.--direction-row.--variant-pills .selector,.--direction-row.--variant-pills-elevated .selector{top:0}.--variant-pills .--item-active:after,.--variant-pills-elevated .--item-active:after{background-color:var(--rs-color-background-neutral);opacity:.6;z-index:0}.--direction-column.--variant-pills .--item-active:after,.--direction-column.--variant-pills-elevated .--item-active:after{width:100%}.--direction-row.--variant-pills .--item-active:after,.--direction-row.--variant-pills-elevated .--item-active:after{height:100%}.--variant-pills-elevated .list{background:var(--rs-color-background-neutral-faded);border:2px solid transparent;border-radius:var(--rs-radius-medium)}.--variant-pills-elevated .--item-active:after,.--variant-pills-elevated .selector{background:var(--rs-color-background-elevation-raised);box-shadow:var(--rs-shadow-raised);box-sizing:border-box;opacity:1}.--size-medium{--rs-tabs-item-p-v:var(--rs-unit-x2);--rs-tabs-item-p-h:var(--rs-unit-x3)}.--size-large{--rs-tabs-item-p-v:var(--rs-unit-x3);--rs-tabs-item-p-h:var(--rs-unit-x4)}.--item-width-equal{max-width:none}.--item-width-equal .inner{flex-wrap:wrap;overflow:hidden}.--item-width-equal .list{display:flex}.--item-width-equal .listItem{flex-basis:0;flex-grow:1;margin:0}.--fade-end .inner,[dir=rtl] .--fade-start .inner{--rs-tabs-mid-r:100%;--rs-tabs-stop-r:calc(100% - var(--rs-unit-x1) * 12)}.--fade-start .inner,[dir=rtl] .--fade-end .inner{--rs-tabs-mid-l:0px;--rs-tabs-stop-l:calc(var(--rs-unit-x1) * 12)}@media (pointer:fine){.control{display:flex}.--fade-end .inner,[dir=rtl] .--fade-start .inner{--rs-tabs-mid-r:calc(100% - var(--rs-unit-x1) * 6);--rs-tabs-stop-r:calc(100% - var(--rs-unit-x1) * 12)}.--fade-start .inner,[dir=rtl] .--fade-end .inner{--rs-tabs-mid-l:calc(var(--rs-unit-x1) * 6);--rs-tabs-stop-l:calc(var(--rs-unit-x1) * 12)}}
|
@@ -7,6 +7,7 @@ import Actionable from "../Actionable/index.js";
|
|
7
7
|
import Icon from "../Icon/index.js";
|
8
8
|
import Text from "../Text/index.js";
|
9
9
|
import useIsomorphicLayoutEffect from "../../hooks/useIsomorphicLayoutEffect.js";
|
10
|
+
import { findParent } from "../../utilities/dom/index.js";
|
10
11
|
import { useTabs } from "./TabsContext.js";
|
11
12
|
import s from "./Tabs.module.css";
|
12
13
|
const TabsItem = (props, ref) => {
|
@@ -23,9 +24,6 @@ const TabsItem = (props, ref) => {
|
|
23
24
|
"aria-selected": active,
|
24
25
|
};
|
25
26
|
const updateRefs = React.useCallback(() => {
|
26
|
-
if (!("current" in itemRef)) {
|
27
|
-
throw new Error("Reshaped, Tabs: TabItem is expecting an object ref format but received a function ref");
|
28
|
-
}
|
29
27
|
elPrevActiveRef.current = elActiveRef.current;
|
30
28
|
elActiveRef.current = itemRef.current;
|
31
29
|
}, [elActiveRef, elPrevActiveRef]);
|
@@ -40,14 +38,22 @@ const TabsItem = (props, ref) => {
|
|
40
38
|
if (!listEl || !currentListItem || !prevListItem || listEl.scrollWidth === listEl.clientWidth) {
|
41
39
|
return;
|
42
40
|
}
|
43
|
-
|
44
|
-
|
45
|
-
//
|
46
|
-
|
47
|
-
const
|
48
|
-
if (!
|
41
|
+
if (!elScrollableRef.current)
|
42
|
+
return;
|
43
|
+
// Big enough value to show there are more items and not overlap arrow controls
|
44
|
+
const visibilityThreshold = 48;
|
45
|
+
const elItem = findParent(itemRef.current, (el) => el.hasAttribute("data-rs-tabs-item"));
|
46
|
+
if (!elItem)
|
49
47
|
return;
|
50
|
-
|
48
|
+
const elScrollable = elScrollableRef.current;
|
49
|
+
const startOverflow = elItem.offsetLeft - elScrollable.scrollLeft;
|
50
|
+
const endOverflow = elScrollable.scrollLeft + elScrollable.clientWidth - (elItem.offsetLeft + elItem.clientWidth);
|
51
|
+
if (startOverflow < visibilityThreshold || endOverflow < visibilityThreshold) {
|
52
|
+
elScrollableRef.current.scrollTo({
|
53
|
+
left: elItem.offsetLeft + elItem.clientWidth / 2 - elScrollable.clientWidth / 2,
|
54
|
+
behavior: "smooth",
|
55
|
+
});
|
56
|
+
}
|
51
57
|
};
|
52
58
|
useIsomorphicLayoutEffect(() => {
|
53
59
|
if (!active)
|
@@ -6,7 +6,8 @@ import useRTL from "../../hooks/useRTL.js";
|
|
6
6
|
import { focusNextElement, focusPreviousElement, focusFirstElement, focusLastElement, } from "../../utilities/a11y/index.js";
|
7
7
|
import useIsomorphicLayoutEffect from "../../hooks/useIsomorphicLayoutEffect.js";
|
8
8
|
import useHotkeys from "../../hooks/useHotkeys.js";
|
9
|
-
import
|
9
|
+
import Actionable from "../Actionable/index.js";
|
10
|
+
import Icon from "../Icon/index.js";
|
10
11
|
import IconChevronRight from "../../icons/ChevronRight.js";
|
11
12
|
import IconChevronLeft from "../../icons/ChevronLeft.js";
|
12
13
|
import TabsItem from "./TabsItem.js";
|
@@ -60,30 +61,21 @@ const TabsList = (props) => {
|
|
60
61
|
};
|
61
62
|
}, [elScrollableRef]);
|
62
63
|
const { ref: hotkeysRef } = useHotkeys({
|
63
|
-
"ArrowLeft, ArrowUp": (
|
64
|
-
if (name)
|
65
|
-
return;
|
66
|
-
e.preventDefault();
|
64
|
+
"ArrowLeft, ArrowUp": () => {
|
67
65
|
focusPreviousElement(elScrollableRef.current);
|
68
66
|
},
|
69
|
-
"ArrowRight, ArrowDown": (
|
70
|
-
if (name)
|
71
|
-
return;
|
72
|
-
e.preventDefault();
|
67
|
+
"ArrowRight, ArrowDown": () => {
|
73
68
|
focusNextElement(elScrollableRef.current);
|
74
69
|
},
|
75
|
-
Home: (
|
76
|
-
if (name)
|
77
|
-
return;
|
78
|
-
e.preventDefault();
|
70
|
+
Home: () => {
|
79
71
|
focusFirstElement(elScrollableRef.current);
|
80
72
|
},
|
81
|
-
End: (
|
82
|
-
if (name)
|
83
|
-
return;
|
84
|
-
e.preventDefault();
|
73
|
+
End: () => {
|
85
74
|
focusLastElement(elScrollableRef.current);
|
86
75
|
},
|
76
|
+
}, [], {
|
77
|
+
preventDefault: true,
|
78
|
+
disabled: !!name,
|
87
79
|
});
|
88
80
|
useIsomorphicLayoutEffect(() => {
|
89
81
|
if (value)
|
@@ -145,12 +137,20 @@ const TabsList = (props) => {
|
|
145
137
|
return (_jsxs("div", { ...attributes, className: rootClassNames, children: [_jsx("div", { className: s.inner, ref: elScrollableRef, children: _jsxs("div", { className: s.list, role: "tablist", ref: hotkeysRef, children: [React.Children.map(children, (child, index) => {
|
146
138
|
if (!child)
|
147
139
|
return null;
|
148
|
-
return (_jsx("div", { className: s.listItem, children: child }, child.props.value || child.key || index));
|
140
|
+
return (_jsx("div", { className: s.listItem, "data-rs-tabs-item": true, children: child }, child.props.value || child.key || index));
|
149
141
|
}), _jsx("div", { onTransitionEnd: handleTransitionEnd, className: selectorClassNames, style: {
|
150
142
|
"--rs-tab-selection-x": selection.left,
|
151
143
|
"--rs-tab-selection-y": selection.top,
|
152
144
|
"--rs-tab-selection-scale-x": selection.scaleX,
|
153
145
|
"--rs-tab-selection-scale-y": selection.scaleY,
|
154
|
-
} })] }) }),
|
146
|
+
} })] }) }), _jsx(Actionable, { onClick: handlePrevClick, attributes: { "aria-hidden": true, tabIndex: -1 }, className: [
|
147
|
+
s.control,
|
148
|
+
s["control--prev"],
|
149
|
+
(fadeSide === "start" || fadeSide === "both") && s["control--active"],
|
150
|
+
], children: _jsx(Icon, { svg: IconChevronLeft, size: 5 }) }), _jsx(Actionable, { onClick: handleNextClick, attributes: { "aria-hidden": true, tabIndex: -1 }, className: [
|
151
|
+
s.control,
|
152
|
+
s["control--next"],
|
153
|
+
(fadeSide === "end" || fadeSide === "both") && s["control--active"],
|
154
|
+
], children: _jsx(Icon, { svg: IconChevronRight, size: 5 }) })] }));
|
155
155
|
};
|
156
156
|
export default TabsList;
|
@@ -1 +1 @@
|
|
1
|
-
.root{--rs-p-h:var(--rs-text-field-gap);align-items:center;background:var(--rs-color-background-elevation-base);border:1px solid var(--rs-color-border-neutral);display:flex;gap:var(--rs-text-field-gap);padding:calc(var(--rs-unit-x1) - 1px) var(--rs-text-field-gap);position:relative;row-gap:var(--rs-unit-x1);z-index:0}.root:not(:has(button:focus,a:focus,[tabindex="0"]:focus)):focus-within{border-color:var(--rs-color-border-primary);box-shadow:0 0 0 1px var(--rs-color-border-primary)}.root.--multiline{flex-wrap:wrap}.root.--multiline .input{width:auto}.root.--rounded{border-radius:999px}.root.--rounded .affix:first-child,.root.--rounded .icon:first-child{padding-inline-start:var(--rs-unit-x1)}.root.--rounded .input:first-child{padding-inline-start:calc(var(--rs-text-field-gap) + var(--rs-unit-x1))}.input{background:none;border:none;box-sizing:border-box;color:var(--rs-color-foreground-neutral);flex-grow:1;font-family:var(--rs-font-family-body);font-weight:var(--rs-font-weight-regular);margin:calc(var(--rs-unit-x1) * -1) calc(var(--rs-text-field-gap) * -1);outline:none;padding-inline:var(--rs-text-field-gap);position:relative;width:100%;z-index:1}.input:-webkit-autofill{-webkit-background-clip:text;-webkit-text-fill-color:var(--rs-color-foreground-neutral)}.affix,.icon,.slot{align-items:center;display:flex;flex-shrink:0;min-height:calc(var(--rs-text-field-line-height) + var(--rs-unit-x1) * 2);position:relative;z-index:5}.slot--position-end:last-child{margin-inline-end:calc(var(--rs-unit-x1) * -1)}.icon{pointer-events:none}.affix{color:var(--rs-color-foreground-neutral-faded)}.affix.affix--position-start{padding-inline-end:var(--rs-text-field-gap)}.affix.affix--position-start:after{border-inline-end:1px solid var(--rs-color-border-neutral-faded);content:"";inset-block:var(--rs-unit-x1);inset-inline-end:0;position:absolute}.affix.affix--position-end{padding-inline-start:var(--rs-text-field-gap)}.affix.affix--position-end:after{border-inline-start:1px solid var(--rs-color-border-neutral-faded);content:"";inset-block:var(--rs-unit-x1);inset-inline-start:0;position:absolute}.root.--disabled{background:var(--rs-color-background-disabled-faded);border-color:var(--rs-color-border-disabled)}.root.--disabled,.root.--disabled .input{color:var(--rs-color-foreground-disabled);cursor:not-allowed}.--size-medium{--rs-text-field-gap:var(--rs-unit-x2);--rs-text-field-line-height:var(--rs-line-height-body-3);border-radius:var(--rs-radius-small)}.--size-medium .input{padding-block:var(--rs-unit-x2)}.--size-medium .affix,.--size-medium .input{font-size:var(--rs-font-size-body-3);letter-spacing:var(--rs-letter-spacing-body-3);line-height:var(--rs-line-height-body-3)}.--size-large{--rs-text-field-gap:var(--rs-unit-x3);--rs-text-field-line-height:var(--rs-line-height-body-2);border-radius:var(--rs-radius-medium)}.--size-large .input{padding-block:var(--rs-unit-x3)}.--size-large .affix,.--size-large .input{font-size:var(--rs-font-size-body-2);letter-spacing:var(--rs-letter-spacing-body-2);line-height:var(--rs-line-height-body-2)}.--size-xlarge{--rs-text-field-gap:var(--rs-unit-x4);--rs-text-field-line-height:var(--rs-line-height-body-2);border-radius:var(--rs-radius-medium)}.--size-xlarge .input{padding-block:var(--rs-unit-x4)}.--size-xlarge .affix,.--size-xlarge .input{font-size:var(--rs-font-size-body-2);letter-spacing:var(--rs-letter-spacing-body-2);line-height:var(--rs-line-height-body-2)}.root.--variant-faded{background:var(--rs-color-background-neutral-faded);border-color:transparent}.root.--variant-faded:focus-within{border-color:var(--rs-color-border-primary)}.root.--variant-headless{background:transparent;border-color:transparent}.root.--variant-headless.--status-error,.root.--variant-headless.--status-error:focus-within,.root.--variant-headless:focus-within{border-color:transparent;box-shadow:none}.root.--status-error{border-color:var(--rs-color-border-critical)}.root.--status-error:focus-within{border-color:var(--rs-color-border-primary)}@media (--rs-viewport-s ) and (hover:none){.input{font-size:var(--rs-font-size-body-2)!important}}@media (--rs-viewport-m ){.--size-medium--m{--rs-text-field-gap:var(--rs-unit-x2);--rs-text-field-line-height:var(--rs-line-height-body-3);border-radius:var(--rs-radius-small)}.--size-medium--m .input{padding-block:var(--rs-unit-x2)}.--size-medium--m .affix,.--size-medium--m .input{font-size:var(--rs-font-size-body-3);letter-spacing:var(--rs-letter-spacing-body-3);line-height:var(--rs-line-height-body-3)}.--size-large--m{--rs-text-field-gap:var(--rs-unit-x3);--rs-text-field-line-height:var(--rs-line-height-body-2);border-radius:var(--rs-radius-medium)}.--size-large--m .input{padding-block:var(--rs-unit-x3)}.--size-large--m .affix,.--size-large--m .input{font-size:var(--rs-font-size-body-2);letter-spacing:var(--rs-letter-spacing-body-2);line-height:var(--rs-line-height-body-2)}.--size-xlarge--m{--rs-text-field-gap:var(--rs-unit-x4);--rs-text-field-line-height:var(--rs-line-height-body-2);border-radius:var(--rs-radius-medium)}.--size-xlarge--m .input{padding-block:var(--rs-unit-x4)}.--size-xlarge--m .affix,.--size-xlarge--m .input{font-size:var(--rs-font-size-body-2);letter-spacing:var(--rs-letter-spacing-body-2);line-height:var(--rs-line-height-body-2)}}@media (--rs-viewport-l ){.--size-medium--l{--rs-text-field-gap:var(--rs-unit-x2);--rs-text-field-line-height:var(--rs-line-height-body-3);border-radius:var(--rs-radius-small)}.--size-medium--l .input{padding-block:var(--rs-unit-x2)}.--size-medium--l .affix,.--size-medium--l .input{font-size:var(--rs-font-size-body-3);letter-spacing:var(--rs-letter-spacing-body-3);line-height:var(--rs-line-height-body-3)}.--size-large--l{--rs-text-field-gap:var(--rs-unit-x3);--rs-text-field-line-height:var(--rs-line-height-body-2);border-radius:var(--rs-radius-medium)}.--size-large--l .input{padding-block:var(--rs-unit-x3)}.--size-large--l .affix,.--size-large--l .input{font-size:var(--rs-font-size-body-2);letter-spacing:var(--rs-letter-spacing-body-2);line-height:var(--rs-line-height-body-2)}.--size-xlarge--l{--rs-text-field-gap:var(--rs-unit-x4);--rs-text-field-line-height:var(--rs-line-height-body-2);border-radius:var(--rs-radius-medium)}.--size-xlarge--l .input{padding-block:var(--rs-unit-x4)}.--size-xlarge--l .affix,.--size-xlarge--l .input{font-size:var(--rs-font-size-body-2);letter-spacing:var(--rs-letter-spacing-body-2);line-height:var(--rs-line-height-body-2)}}@media (--rs-viewport-xl ){.--size-medium--xl{--rs-text-field-gap:var(--rs-unit-x2);--rs-text-field-line-height:var(--rs-line-height-body-3);border-radius:var(--rs-radius-small)}.--size-medium--xl .input{padding-block:var(--rs-unit-x2)}.--size-medium--xl .affix,.--size-medium--xl .input{font-size:var(--rs-font-size-body-3);letter-spacing:var(--rs-letter-spacing-body-3);line-height:var(--rs-line-height-body-3)}.--size-large--xl{--rs-text-field-gap:var(--rs-unit-x3);--rs-text-field-line-height:var(--rs-line-height-body-2);border-radius:var(--rs-radius-medium)}.--size-large--xl .input{padding-block:var(--rs-unit-x3)}.--size-large--xl .affix,.--size-large--xl .input{font-size:var(--rs-font-size-body-2);letter-spacing:var(--rs-letter-spacing-body-2);line-height:var(--rs-line-height-body-2)}.--size-xlarge--xl{--rs-text-field-gap:var(--rs-unit-x4);--rs-text-field-line-height:var(--rs-line-height-body-2);border-radius:var(--rs-radius-medium)}.--size-xlarge--xl .input{padding-block:var(--rs-unit-x4)}.--size-xlarge--xl .affix,.--size-xlarge--xl .input{font-size:var(--rs-font-size-body-2);letter-spacing:var(--rs-letter-spacing-body-2);line-height:var(--rs-line-height-body-2)}}
|
1
|
+
.root{--rs-p-h:var(--rs-text-field-gap);align-items:center;background:var(--rs-color-background-elevation-base);border:1px solid var(--rs-color-border-neutral);display:flex;gap:var(--rs-text-field-gap);padding:calc(var(--rs-unit-x1) - 1px) calc(var(--rs-text-field-gap) - 1px);position:relative;row-gap:var(--rs-unit-x1);z-index:0}.root:not(:has(button:focus,a:focus,[tabindex="0"]:focus)):focus-within{border-color:var(--rs-color-border-primary);box-shadow:0 0 0 1px var(--rs-color-border-primary)}.root.--multiline{flex-wrap:wrap}.root.--multiline .input{width:auto}.root.--rounded{border-radius:999px}.root.--rounded .affix:first-child,.root.--rounded .icon:first-child{padding-inline-start:var(--rs-unit-x1)}.root.--rounded .input:first-child{padding-inline-start:calc(var(--rs-text-field-gap) + var(--rs-unit-x1))}.input{background:none;border:none;box-sizing:border-box;color:var(--rs-color-foreground-neutral);flex-grow:1;font-family:var(--rs-font-family-body);font-weight:var(--rs-font-weight-regular);margin:calc(var(--rs-unit-x1) * -1) calc(var(--rs-text-field-gap) * -1);outline:none;padding-inline:var(--rs-text-field-gap);position:relative;width:100%;z-index:1}.input:-webkit-autofill{-webkit-background-clip:text;-webkit-text-fill-color:var(--rs-color-foreground-neutral)}.affix,.icon,.slot{align-items:center;display:flex;flex-shrink:0;min-height:calc(var(--rs-text-field-line-height) + var(--rs-unit-x1) * 2);position:relative;z-index:5}.slot--position-end:last-child{margin-inline-end:calc(var(--rs-unit-x1) * -1)}.icon{pointer-events:none}.affix{color:var(--rs-color-foreground-neutral-faded)}.affix.affix--position-start{padding-inline-end:var(--rs-text-field-gap)}.affix.affix--position-start:after{border-inline-end:1px solid var(--rs-color-border-neutral-faded);content:"";inset-block:var(--rs-unit-x1);inset-inline-end:0;position:absolute}.affix.affix--position-end{padding-inline-start:var(--rs-text-field-gap)}.affix.affix--position-end:after{border-inline-start:1px solid var(--rs-color-border-neutral-faded);content:"";inset-block:var(--rs-unit-x1);inset-inline-start:0;position:absolute}.root.--disabled{background:var(--rs-color-background-disabled-faded);border-color:var(--rs-color-border-disabled)}.root.--disabled,.root.--disabled .input{color:var(--rs-color-foreground-disabled);cursor:not-allowed}.--size-medium{--rs-text-field-gap:var(--rs-unit-x2);--rs-text-field-line-height:var(--rs-line-height-body-3);border-radius:var(--rs-radius-small)}.--size-medium .input{padding-block:var(--rs-unit-x2)}.--size-medium .affix,.--size-medium .input{font-size:var(--rs-font-size-body-3);letter-spacing:var(--rs-letter-spacing-body-3);line-height:var(--rs-line-height-body-3)}.--size-large{--rs-text-field-gap:var(--rs-unit-x3);--rs-text-field-line-height:var(--rs-line-height-body-2);border-radius:var(--rs-radius-medium)}.--size-large .input{padding-block:var(--rs-unit-x3)}.--size-large .affix,.--size-large .input{font-size:var(--rs-font-size-body-2);letter-spacing:var(--rs-letter-spacing-body-2);line-height:var(--rs-line-height-body-2)}.--size-xlarge{--rs-text-field-gap:var(--rs-unit-x4);--rs-text-field-line-height:var(--rs-line-height-body-2);border-radius:var(--rs-radius-medium)}.--size-xlarge .input{padding-block:var(--rs-unit-x4)}.--size-xlarge .affix,.--size-xlarge .input{font-size:var(--rs-font-size-body-2);letter-spacing:var(--rs-letter-spacing-body-2);line-height:var(--rs-line-height-body-2)}.root.--variant-faded{background:var(--rs-color-background-neutral-faded);border-color:transparent}.root.--variant-faded:focus-within{border-color:var(--rs-color-border-primary)}.root.--variant-headless{background:transparent;border-color:transparent}.root.--variant-headless.--status-error,.root.--variant-headless.--status-error:focus-within,.root.--variant-headless:focus-within{border-color:transparent;box-shadow:none}.root.--status-error{border-color:var(--rs-color-border-critical)}.root.--status-error:focus-within{border-color:var(--rs-color-border-primary)}@media (--rs-viewport-s ) and (hover:none){.input{font-size:var(--rs-font-size-body-2)!important}}@media (--rs-viewport-m ){.--size-medium--m{--rs-text-field-gap:var(--rs-unit-x2);--rs-text-field-line-height:var(--rs-line-height-body-3);border-radius:var(--rs-radius-small)}.--size-medium--m .input{padding-block:var(--rs-unit-x2)}.--size-medium--m .affix,.--size-medium--m .input{font-size:var(--rs-font-size-body-3);letter-spacing:var(--rs-letter-spacing-body-3);line-height:var(--rs-line-height-body-3)}.--size-large--m{--rs-text-field-gap:var(--rs-unit-x3);--rs-text-field-line-height:var(--rs-line-height-body-2);border-radius:var(--rs-radius-medium)}.--size-large--m .input{padding-block:var(--rs-unit-x3)}.--size-large--m .affix,.--size-large--m .input{font-size:var(--rs-font-size-body-2);letter-spacing:var(--rs-letter-spacing-body-2);line-height:var(--rs-line-height-body-2)}.--size-xlarge--m{--rs-text-field-gap:var(--rs-unit-x4);--rs-text-field-line-height:var(--rs-line-height-body-2);border-radius:var(--rs-radius-medium)}.--size-xlarge--m .input{padding-block:var(--rs-unit-x4)}.--size-xlarge--m .affix,.--size-xlarge--m .input{font-size:var(--rs-font-size-body-2);letter-spacing:var(--rs-letter-spacing-body-2);line-height:var(--rs-line-height-body-2)}}@media (--rs-viewport-l ){.--size-medium--l{--rs-text-field-gap:var(--rs-unit-x2);--rs-text-field-line-height:var(--rs-line-height-body-3);border-radius:var(--rs-radius-small)}.--size-medium--l .input{padding-block:var(--rs-unit-x2)}.--size-medium--l .affix,.--size-medium--l .input{font-size:var(--rs-font-size-body-3);letter-spacing:var(--rs-letter-spacing-body-3);line-height:var(--rs-line-height-body-3)}.--size-large--l{--rs-text-field-gap:var(--rs-unit-x3);--rs-text-field-line-height:var(--rs-line-height-body-2);border-radius:var(--rs-radius-medium)}.--size-large--l .input{padding-block:var(--rs-unit-x3)}.--size-large--l .affix,.--size-large--l .input{font-size:var(--rs-font-size-body-2);letter-spacing:var(--rs-letter-spacing-body-2);line-height:var(--rs-line-height-body-2)}.--size-xlarge--l{--rs-text-field-gap:var(--rs-unit-x4);--rs-text-field-line-height:var(--rs-line-height-body-2);border-radius:var(--rs-radius-medium)}.--size-xlarge--l .input{padding-block:var(--rs-unit-x4)}.--size-xlarge--l .affix,.--size-xlarge--l .input{font-size:var(--rs-font-size-body-2);letter-spacing:var(--rs-letter-spacing-body-2);line-height:var(--rs-line-height-body-2)}}@media (--rs-viewport-xl ){.--size-medium--xl{--rs-text-field-gap:var(--rs-unit-x2);--rs-text-field-line-height:var(--rs-line-height-body-3);border-radius:var(--rs-radius-small)}.--size-medium--xl .input{padding-block:var(--rs-unit-x2)}.--size-medium--xl .affix,.--size-medium--xl .input{font-size:var(--rs-font-size-body-3);letter-spacing:var(--rs-letter-spacing-body-3);line-height:var(--rs-line-height-body-3)}.--size-large--xl{--rs-text-field-gap:var(--rs-unit-x3);--rs-text-field-line-height:var(--rs-line-height-body-2);border-radius:var(--rs-radius-medium)}.--size-large--xl .input{padding-block:var(--rs-unit-x3)}.--size-large--xl .affix,.--size-large--xl .input{font-size:var(--rs-font-size-body-2);letter-spacing:var(--rs-letter-spacing-body-2);line-height:var(--rs-line-height-body-2)}.--size-xlarge--xl{--rs-text-field-gap:var(--rs-unit-x4);--rs-text-field-line-height:var(--rs-line-height-body-2);border-radius:var(--rs-radius-medium)}.--size-xlarge--xl .input{padding-block:var(--rs-unit-x4)}.--size-xlarge--xl .affix,.--size-xlarge--xl .input{font-size:var(--rs-font-size-body-2);letter-spacing:var(--rs-letter-spacing-body-2);line-height:var(--rs-line-height-body-2)}}
|
@@ -3,13 +3,18 @@ import { jsx as _jsx } from "react/jsx-runtime";
|
|
3
3
|
import React from "react";
|
4
4
|
import useIsomorphicLayoutEffect from "../../hooks/useIsomorphicLayoutEffect.js";
|
5
5
|
import { enableTransitions, disableTransitions, onNextFrame } from "../../utilities/animation.js";
|
6
|
+
import { useGlobalColorMode } from "./useTheme.js";
|
6
7
|
import { GlobalColorModeContext } from "./Theme.context.js";
|
7
8
|
import { getRootThemeEl } from "./Theme.utilities.js";
|
8
9
|
const GlobalColorMode = (props) => {
|
9
|
-
const { defaultMode, children } = props;
|
10
|
-
const [mode, setMode] = React.useState(defaultMode
|
10
|
+
const { defaultMode, scopeRef, children } = props;
|
11
|
+
const [mode, setMode] = React.useState(defaultMode);
|
12
|
+
const parentGlobalColorMode = useGlobalColorMode();
|
11
13
|
const changeColorMode = React.useCallback((targetMode) => {
|
12
|
-
getRootThemeEl().setAttribute("data-rs-color-mode", targetMode);
|
14
|
+
getRootThemeEl(scopeRef?.current).setAttribute("data-rs-color-mode", targetMode);
|
15
|
+
if (parentGlobalColorMode.mode && !scopeRef) {
|
16
|
+
parentGlobalColorMode.setMode(targetMode);
|
17
|
+
}
|
13
18
|
setMode((prevMode) => {
|
14
19
|
if (prevMode !== targetMode) {
|
15
20
|
// Avoid components styles animating when switching to another color mode
|
@@ -17,7 +22,7 @@ const GlobalColorMode = (props) => {
|
|
17
22
|
}
|
18
23
|
return targetMode;
|
19
24
|
});
|
20
|
-
}, []);
|
25
|
+
}, [scopeRef, parentGlobalColorMode]);
|
21
26
|
useIsomorphicLayoutEffect(() => {
|
22
27
|
onNextFrame(() => {
|
23
28
|
enableTransitions();
|
@@ -28,10 +33,10 @@ const GlobalColorMode = (props) => {
|
|
28
33
|
* This could happen if we're receiving the mode on the client but before React hydration
|
29
34
|
*/
|
30
35
|
useIsomorphicLayoutEffect(() => {
|
31
|
-
const nextColorMode = getRootThemeEl().getAttribute("data-rs-color-mode");
|
36
|
+
const nextColorMode = getRootThemeEl(scopeRef?.current).getAttribute("data-rs-color-mode");
|
32
37
|
if (nextColorMode)
|
33
38
|
changeColorMode(nextColorMode);
|
34
|
-
}, []);
|
39
|
+
}, [changeColorMode, scopeRef]);
|
35
40
|
const value = React.useMemo(() => ({
|
36
41
|
mode,
|
37
42
|
setMode: changeColorMode,
|
@@ -1,16 +1,6 @@
|
|
1
1
|
"use client";
|
2
2
|
import React from "react";
|
3
3
|
/* Context used to store data responsible for switching between modes of a theme */
|
4
|
-
export const ThemeContext = React.createContext({
|
5
|
-
theme: "",
|
6
|
-
rootTheme: "",
|
7
|
-
colorMode: "light",
|
8
|
-
setTheme: () => { },
|
9
|
-
setRootTheme: () => { },
|
10
|
-
});
|
4
|
+
export const ThemeContext = React.createContext({});
|
11
5
|
/* Context used to globally define mode, used only within the library */
|
12
|
-
export const GlobalColorModeContext = React.createContext({
|
13
|
-
mode: "light",
|
14
|
-
setMode: () => { },
|
15
|
-
invertMode: () => { },
|
16
|
-
});
|
6
|
+
export const GlobalColorModeContext = React.createContext({});
|
@@ -9,15 +9,15 @@ import { useTheme, useGlobalColorMode } from "./useTheme.js";
|
|
9
9
|
import s from "./Theme.module.css";
|
10
10
|
const Theme = (props) => _jsx(PrivateTheme, { ...props });
|
11
11
|
export const PrivateTheme = (props) => {
|
12
|
-
const { name, defaultName, colorMode, scoped, children, className } = props;
|
12
|
+
const { name, defaultName, colorMode, scoped, scopeRef, children, className } = props;
|
13
13
|
const [mounted, setMounted] = React.useState(false);
|
14
14
|
const [stateTheme, setStateTheme] = React.useState(defaultName);
|
15
15
|
const globalColorMode = useGlobalColorMode();
|
16
16
|
const parentTheme = useTheme();
|
17
17
|
const isRootProvider = !parentTheme.theme;
|
18
18
|
const usedTheme = name || stateTheme || parentTheme.theme;
|
19
|
-
const rootTheme = isRootProvider ? usedTheme : parentTheme.rootTheme;
|
20
|
-
const parentColorMode = isRootProvider ? globalColorMode : parentTheme.colorMode;
|
19
|
+
const rootTheme = isRootProvider || scoped ? usedTheme : parentTheme.rootTheme;
|
20
|
+
const parentColorMode = isRootProvider || scoped ? globalColorMode.mode : parentTheme.colorMode;
|
21
21
|
const invertedColorMode = parentColorMode === "light" ? "dark" : "light";
|
22
22
|
const usedColorMode = colorMode === "inverted" ? invertedColorMode : colorMode || parentColorMode;
|
23
23
|
const rootClassNames = classNames(s.root, className);
|
@@ -38,7 +38,7 @@ export const PrivateTheme = (props) => {
|
|
38
38
|
useIsomorphicLayoutEffect(() => {
|
39
39
|
if (!document || !isRootProvider)
|
40
40
|
return;
|
41
|
-
const themeRootEl = getRootThemeEl();
|
41
|
+
const themeRootEl = getRootThemeEl(scopeRef?.current);
|
42
42
|
const hasColorModeApplied = themeRootEl.getAttribute("data-rs-color-mode");
|
43
43
|
themeRootEl.setAttribute("data-rs-theme", usedTheme);
|
44
44
|
if (!hasColorModeApplied)
|
@@ -48,7 +48,7 @@ export const PrivateTheme = (props) => {
|
|
48
48
|
if (!hasColorModeApplied)
|
49
49
|
themeRootEl.removeAttribute("data-rs-color-mode");
|
50
50
|
};
|
51
|
-
}, [usedTheme, usedColorMode, isRootProvider]);
|
51
|
+
}, [usedTheme, usedColorMode, isRootProvider, scopeRef]);
|
52
52
|
const value = React.useMemo(() => ({
|
53
53
|
theme: usedTheme,
|
54
54
|
rootTheme,
|
@@ -56,6 +56,6 @@ export const PrivateTheme = (props) => {
|
|
56
56
|
setTheme,
|
57
57
|
setRootTheme,
|
58
58
|
}), [usedTheme, usedColorMode, setTheme, setRootTheme, rootTheme]);
|
59
|
-
return (_jsx(ThemeContext.Provider, { value: value, children: _jsx("div", { className: rootClassNames, "data-rs-root": scoped ? true : undefined, "data-rs-theme": isRootProvider ? undefined : usedTheme, "data-rs-color-mode": isRootProvider || (!colorMode && !mounted) ? undefined : usedColorMode, children: children }) }));
|
59
|
+
return (_jsx(ThemeContext.Provider, { value: value, children: _jsx("div", { className: rootClassNames, ref: scopeRef, "data-rs-root": scoped ? true : undefined, "data-rs-theme": isRootProvider ? undefined : usedTheme, "data-rs-color-mode": isRootProvider || (!colorMode && !mounted) ? undefined : usedColorMode, children: children }) }));
|
60
60
|
};
|
61
61
|
export default Theme;
|
@@ -22,9 +22,10 @@ export type Props = {
|
|
22
22
|
};
|
23
23
|
export type PrivateProps = Props & {
|
24
24
|
scoped?: boolean;
|
25
|
+
scopeRef?: React.RefObject<HTMLDivElement>;
|
25
26
|
};
|
26
27
|
export type GlobalColorModeProps = {
|
27
|
-
defaultMode
|
28
|
-
|
28
|
+
defaultMode: ColorMode;
|
29
|
+
scopeRef?: React.RefObject<HTMLDivElement>;
|
29
30
|
children?: React.ReactNode;
|
30
31
|
};
|
@@ -1 +1 @@
|
|
1
|
-
export declare const getRootThemeEl: () =>
|
1
|
+
export declare const getRootThemeEl: (scopeEl?: HTMLElement | null) => HTMLElement;
|
@@ -1 +1,10 @@
|
|
1
|
-
export const getRootThemeEl = () =>
|
1
|
+
export const getRootThemeEl = (scopeEl) => {
|
2
|
+
if (!scopeEl)
|
3
|
+
return document.documentElement;
|
4
|
+
if (scopeEl.hasAttribute("data-rs-root") ||
|
5
|
+
scopeEl === document.documentElement ||
|
6
|
+
!scopeEl.parentElement) {
|
7
|
+
return scopeEl;
|
8
|
+
}
|
9
|
+
return getRootThemeEl(scopeEl.parentElement);
|
10
|
+
};
|
@@ -9,4 +9,5 @@ declare const _default: {
|
|
9
9
|
};
|
10
10
|
export default _default;
|
11
11
|
export declare const uncontrolled: () => import("react").JSX.Element;
|
12
|
+
export declare const nestedReshaped: () => import("react").JSX.Element;
|
12
13
|
export declare const edgeCases: () => import("react").JSX.Element;
|
@@ -4,6 +4,7 @@ import View from "../../View/index.js";
|
|
4
4
|
import MenuItem from "../../MenuItem/index.js";
|
5
5
|
import Theme, { useTheme } from "../index.js";
|
6
6
|
import { Example } from "../../../utilities/storybook/index.js";
|
7
|
+
import Reshaped from "../../Reshaped/index.js";
|
7
8
|
export default {
|
8
9
|
title: "Utilities/Theme",
|
9
10
|
component: Theme,
|
@@ -15,7 +16,7 @@ export default {
|
|
15
16
|
};
|
16
17
|
const UncontrolledDemo = () => {
|
17
18
|
const { setTheme, theme } = useTheme();
|
18
|
-
return (<Button color="primary" onClick={() => setTheme(theme === "reshaped" ? "
|
19
|
+
return (<Button color="primary" onClick={() => setTheme(theme === "reshaped" ? "slate" : "reshaped")}>
|
19
20
|
Toggle theme
|
20
21
|
</Button>);
|
21
22
|
};
|
@@ -26,6 +27,38 @@ export const uncontrolled = () => {
|
|
26
27
|
</Example.Item>
|
27
28
|
</Example>);
|
28
29
|
};
|
30
|
+
const Nested = () => {
|
31
|
+
const { invertColorMode, colorMode } = useTheme();
|
32
|
+
return (<Button color="primary" variant="faded" onClick={invertColorMode}>
|
33
|
+
Slate: {colorMode}
|
34
|
+
</Button>);
|
35
|
+
};
|
36
|
+
export const nestedReshaped = () => {
|
37
|
+
const { invertColorMode, colorMode } = useTheme();
|
38
|
+
return (<Example>
|
39
|
+
<Example.Item title="reshaped + scoped slate">
|
40
|
+
<View gap={2} direction="row">
|
41
|
+
<Button color="primary" variant="faded" onClick={invertColorMode}>
|
42
|
+
Reshaped: {colorMode}
|
43
|
+
</Button>
|
44
|
+
<Reshaped theme="slate" scoped>
|
45
|
+
<Nested />
|
46
|
+
</Reshaped>
|
47
|
+
</View>
|
48
|
+
</Example.Item>
|
49
|
+
|
50
|
+
<Example.Item title="reshaped + not scoped slate">
|
51
|
+
<View gap={2} direction="row">
|
52
|
+
<Button color="primary" variant="faded" onClick={invertColorMode}>
|
53
|
+
Reshaped: {colorMode}
|
54
|
+
</Button>
|
55
|
+
<Reshaped theme="slate">
|
56
|
+
<Nested />
|
57
|
+
</Reshaped>
|
58
|
+
</View>
|
59
|
+
</Example.Item>
|
60
|
+
</Example>);
|
61
|
+
};
|
29
62
|
const Demo = () => {
|
30
63
|
const { invertColorMode } = useTheme();
|
31
64
|
return (<View gap={3}>
|
@@ -1,4 +1,4 @@
|
|
1
|
-
export declare const useGlobalColorMode: () => import("./Theme.types").
|
1
|
+
export declare const useGlobalColorMode: () => import("./Theme.types").GlobalColorModeContextData;
|
2
2
|
export declare const useTheme: () => {
|
3
3
|
theme: string;
|
4
4
|
setTheme: (theme: string) => void;
|
@@ -2,8 +2,7 @@
|
|
2
2
|
import React from "react";
|
3
3
|
import { ThemeContext, GlobalColorModeContext } from "./Theme.context.js";
|
4
4
|
export const useGlobalColorMode = () => {
|
5
|
-
|
6
|
-
return mode;
|
5
|
+
return React.useContext(GlobalColorModeContext);
|
7
6
|
};
|
8
7
|
export const useTheme = () => {
|
9
8
|
const { colorMode, theme, setTheme, rootTheme, setRootTheme } = React.useContext(ThemeContext);
|
@@ -2,9 +2,9 @@ import React from "react";
|
|
2
2
|
/**
|
3
3
|
* Types
|
4
4
|
*/
|
5
|
-
type Callback = (e
|
6
|
-
type PressedMap =
|
7
|
-
type Hotkeys = Record<string, Callback | null>;
|
5
|
+
type Callback = (e?: KeyboardEvent) => void;
|
6
|
+
type PressedMap = Map<string, KeyboardEvent>;
|
7
|
+
export type Hotkeys = Record<string, Callback | null>;
|
8
8
|
type HotkeyOptions = {
|
9
9
|
preventDefault?: boolean;
|
10
10
|
};
|