@dxos/react-ui-stack 0.7.5-main.e9bb01b → 0.7.5-staging.2ff1350
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/lib/browser/index.mjs +115 -124
- package/dist/lib/browser/index.mjs.map +4 -4
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/node/index.cjs +161 -169
- package/dist/lib/node/index.cjs.map +4 -4
- package/dist/lib/node/meta.json +1 -1
- package/dist/lib/node-esm/index.mjs +115 -124
- package/dist/lib/node-esm/index.mjs.map +4 -4
- package/dist/lib/node-esm/meta.json +1 -1
- package/dist/types/src/components/MenuSignifier.d.ts +2 -3
- package/dist/types/src/components/MenuSignifier.d.ts.map +1 -1
- package/dist/types/src/components/Stack.d.ts +6 -1
- package/dist/types/src/components/Stack.d.ts.map +1 -1
- package/dist/types/src/components/Stack.stories.d.ts +1 -2
- package/dist/types/src/components/Stack.stories.d.ts.map +1 -1
- package/dist/types/src/components/StackContext.d.ts +2 -1
- package/dist/types/src/components/StackContext.d.ts.map +1 -1
- package/dist/types/src/components/StackItem.d.ts +4 -3
- package/dist/types/src/components/StackItem.d.ts.map +1 -1
- package/dist/types/src/components/StackItemContent.d.ts.map +1 -1
- package/dist/types/src/components/StackItemDragHandle.d.ts +2 -2
- package/dist/types/src/components/StackItemDragHandle.d.ts.map +1 -1
- package/dist/types/src/components/StackItemHeading.d.ts +1 -1
- package/dist/types/src/components/StackItemHeading.d.ts.map +1 -1
- package/dist/types/src/components/StackItemResizeHandle.d.ts +1 -2
- package/dist/types/src/components/StackItemResizeHandle.d.ts.map +1 -1
- package/dist/types/src/hooks/index.d.ts +2 -0
- package/dist/types/src/hooks/index.d.ts.map +1 -0
- package/dist/types/src/hooks/useStackDropForElements.d.ts +15 -0
- package/dist/types/src/hooks/useStackDropForElements.d.ts.map +1 -0
- package/package.json +22 -20
- package/src/components/Stack.stories.tsx +1 -1
- package/src/components/Stack.tsx +44 -57
- package/src/components/StackContext.tsx +3 -1
- package/src/components/StackItem.tsx +28 -7
- package/src/components/StackItemContent.tsx +2 -0
- package/src/components/StackItemResizeHandle.tsx +10 -107
- package/src/hooks/index.ts +5 -0
- package/src/hooks/useStackDropForElements.ts +73 -0
- package/dist/types/src/playwright/playwright.config.d.ts +0 -3
- package/dist/types/src/playwright/playwright.config.d.ts.map +0 -1
- /package/src/playwright/{playwright.config.ts → playwright.config.cts} +0 -0
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { type Orientation } from '../components/Stack';
|
|
2
|
+
import { type StackItemRearrangeHandler } from '../components/StackContext';
|
|
3
|
+
/**
|
|
4
|
+
* Hook to handle drag and drop functionality for Stack components.
|
|
5
|
+
*/
|
|
6
|
+
export declare const useStackDropForElements: ({ element, selfDroppable, orientation, id, onRearrange, }: {
|
|
7
|
+
element: HTMLDivElement | null;
|
|
8
|
+
selfDroppable: boolean;
|
|
9
|
+
orientation: Orientation;
|
|
10
|
+
id?: string;
|
|
11
|
+
onRearrange?: StackItemRearrangeHandler;
|
|
12
|
+
}) => {
|
|
13
|
+
dropping: boolean;
|
|
14
|
+
};
|
|
15
|
+
//# sourceMappingURL=useStackDropForElements.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useStackDropForElements.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useStackDropForElements.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,KAAK,yBAAyB,EAAsB,MAAM,4BAA4B,CAAC;AAEhG;;GAEG;AACH,eAAO,MAAM,uBAAuB,8DAMjC;IACD,OAAO,EAAE,cAAc,GAAG,IAAI,CAAC;IAC/B,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,WAAW,CAAC;IACzB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,yBAAyB,CAAC;CACzC;;CA4CA,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/react-ui-stack",
|
|
3
|
-
"version": "0.7.5-
|
|
3
|
+
"version": "0.7.5-staging.2ff1350",
|
|
4
4
|
"description": "A stack component.",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
7
7
|
"license": "MIT",
|
|
8
8
|
"author": "DXOS.org",
|
|
9
9
|
"sideEffects": true,
|
|
10
|
+
"type": "module",
|
|
10
11
|
"exports": {
|
|
11
12
|
".": {
|
|
12
13
|
"types": "./dist/types/src/index.d.ts",
|
|
@@ -36,6 +37,7 @@
|
|
|
36
37
|
],
|
|
37
38
|
"dependencies": {
|
|
38
39
|
"@atlaskit/pragmatic-drag-and-drop": "^1.4.0",
|
|
40
|
+
"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
|
|
39
41
|
"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
|
|
40
42
|
"@effect/schema": "^0.75.5",
|
|
41
43
|
"@fluentui/react-tabster": "9.23.3",
|
|
@@ -46,12 +48,12 @@
|
|
|
46
48
|
"@radix-ui/react-slot": "1.1.2",
|
|
47
49
|
"@radix-ui/react-use-controllable-state": "1.1.0",
|
|
48
50
|
"react-resize-detector": "^11.0.1",
|
|
49
|
-
"@dxos/echo-schema": "0.7.5-
|
|
50
|
-
"@dxos/keyboard": "0.7.5-
|
|
51
|
-
"@dxos/
|
|
52
|
-
"@dxos/
|
|
53
|
-
"@dxos/
|
|
54
|
-
"@dxos/
|
|
51
|
+
"@dxos/echo-schema": "0.7.5-staging.2ff1350",
|
|
52
|
+
"@dxos/keyboard": "0.7.5-staging.2ff1350",
|
|
53
|
+
"@dxos/live-object": "0.7.5-staging.2ff1350",
|
|
54
|
+
"@dxos/react-ui-attention": "0.7.5-staging.2ff1350",
|
|
55
|
+
"@dxos/react-ui-dnd": "0.7.5-staging.2ff1350",
|
|
56
|
+
"@dxos/util": "0.7.5-staging.2ff1350"
|
|
55
57
|
},
|
|
56
58
|
"devDependencies": {
|
|
57
59
|
"@phosphor-icons/react": "^2.1.5",
|
|
@@ -60,24 +62,24 @@
|
|
|
60
62
|
"react": "~18.2.0",
|
|
61
63
|
"react-dom": "~18.2.0",
|
|
62
64
|
"vite": "5.4.7",
|
|
63
|
-
"@dxos/
|
|
64
|
-
"@dxos/
|
|
65
|
-
"@dxos/
|
|
66
|
-
"@dxos/random": "0.7.5-
|
|
67
|
-
"@dxos/react-ui
|
|
68
|
-
"@dxos/react-ui": "0.7.5-
|
|
69
|
-
"@dxos/
|
|
70
|
-
"@dxos/
|
|
71
|
-
"@dxos/test-utils": "0.7.5-
|
|
65
|
+
"@dxos/echo-schema": "0.7.5-staging.2ff1350",
|
|
66
|
+
"@dxos/app-graph": "0.7.5-staging.2ff1350",
|
|
67
|
+
"@dxos/client": "0.7.5-staging.2ff1350",
|
|
68
|
+
"@dxos/random": "0.7.5-staging.2ff1350",
|
|
69
|
+
"@dxos/react-ui": "0.7.5-staging.2ff1350",
|
|
70
|
+
"@dxos/react-ui-editor": "0.7.5-staging.2ff1350",
|
|
71
|
+
"@dxos/storybook-utils": "0.7.5-staging.2ff1350",
|
|
72
|
+
"@dxos/react-ui-theme": "0.7.5-staging.2ff1350",
|
|
73
|
+
"@dxos/test-utils": "0.7.5-staging.2ff1350"
|
|
72
74
|
},
|
|
73
75
|
"peerDependencies": {
|
|
74
76
|
"@phosphor-icons/react": "^2.1.5",
|
|
75
77
|
"react": "~18.2.0",
|
|
76
78
|
"react-dom": "~18.2.0",
|
|
77
|
-
"@dxos/client": "0.7.5-
|
|
78
|
-
"@dxos/react-ui": "0.7.5-
|
|
79
|
-
"@dxos/
|
|
80
|
-
"@dxos/
|
|
79
|
+
"@dxos/client": "0.7.5-staging.2ff1350",
|
|
80
|
+
"@dxos/react-ui": "0.7.5-staging.2ff1350",
|
|
81
|
+
"@dxos/react-ui-theme": "0.7.5-staging.2ff1350",
|
|
82
|
+
"@dxos/random": "0.7.5-staging.2ff1350"
|
|
81
83
|
},
|
|
82
84
|
"publishConfig": {
|
|
83
85
|
"access": "public"
|
|
@@ -126,7 +126,7 @@ export const Default: Story = {
|
|
|
126
126
|
};
|
|
127
127
|
|
|
128
128
|
const meta: Meta<typeof StorybookStack> = {
|
|
129
|
-
title: 'ui/react-ui-stack
|
|
129
|
+
title: 'ui/react-ui-stack/Stack',
|
|
130
130
|
component: StorybookStack,
|
|
131
131
|
decorators: [withTheme],
|
|
132
132
|
argTypes: { orientation: { control: 'radio', options: ['horizontal', 'vertical'] } },
|
package/src/components/Stack.tsx
CHANGED
|
@@ -1,34 +1,34 @@
|
|
|
1
1
|
//
|
|
2
|
-
// Copyright
|
|
2
|
+
// Copyright 2025 DXOS.org
|
|
3
3
|
//
|
|
4
|
-
|
|
5
|
-
import { attachClosestEdge, extractClosestEdge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge';
|
|
4
|
+
|
|
6
5
|
import { useArrowNavigationGroup } from '@fluentui/react-tabster';
|
|
7
6
|
import { composeRefs } from '@radix-ui/react-compose-refs';
|
|
8
|
-
import React, {
|
|
9
|
-
Children,
|
|
10
|
-
type CSSProperties,
|
|
11
|
-
type ComponentPropsWithRef,
|
|
12
|
-
forwardRef,
|
|
13
|
-
useLayoutEffect,
|
|
14
|
-
useState,
|
|
15
|
-
} from 'react';
|
|
7
|
+
import React, { Children, type CSSProperties, type ComponentPropsWithRef, forwardRef, useState, useMemo } from 'react';
|
|
16
8
|
|
|
17
9
|
import { type ThemedClassName, ListItem } from '@dxos/react-ui';
|
|
18
10
|
import { mx } from '@dxos/react-ui-theme';
|
|
19
11
|
|
|
20
|
-
import { type StackContextValue, StackContext
|
|
12
|
+
import { type StackContextValue, StackContext } from './StackContext';
|
|
13
|
+
import { useStackDropForElements } from '../hooks';
|
|
21
14
|
|
|
22
15
|
export type Orientation = 'horizontal' | 'vertical';
|
|
23
|
-
export type Size = 'intrinsic' | 'contain';
|
|
16
|
+
export type Size = 'intrinsic' | 'contain' | 'contain-fit-content';
|
|
24
17
|
|
|
25
18
|
export type StackProps = Omit<ThemedClassName<ComponentPropsWithRef<'div'>>, 'aria-orientation'> &
|
|
26
19
|
Partial<StackContextValue> & { itemsCount?: number };
|
|
27
20
|
|
|
28
21
|
export const railGridHorizontal = 'grid-rows-[[rail-start]_var(--rail-size)_[content-start]_1fr_[content-end]]';
|
|
29
|
-
|
|
30
22
|
export const railGridVertical = 'grid-cols-[[rail-start]_var(--rail-size)_[content-start]_1fr_[content-end]]';
|
|
31
23
|
|
|
24
|
+
// TODO(ZaymonFC): Magic 2px to stop overflow (tabster dummies... ask @thure).
|
|
25
|
+
export const railGridHorizontalContainFitContent =
|
|
26
|
+
'grid-rows-[[rail-start]_var(--rail-size)_[content-start]_fit-content(calc(100%-var(--rail-size)*2+2px))_[content-end]]';
|
|
27
|
+
export const railGridVerticalContainFitContent =
|
|
28
|
+
'grid-cols-[[rail-start]_var(--rail-size)_[content-start]_fit-content(calc(100%-var(--rail-size)*2+2px))_[content-end]]';
|
|
29
|
+
|
|
30
|
+
export const autoScrollRootAttributes = { 'data-drag-autoscroll': 'idle' };
|
|
31
|
+
|
|
32
32
|
export const Stack = forwardRef<HTMLDivElement, StackProps>(
|
|
33
33
|
(
|
|
34
34
|
{
|
|
@@ -46,49 +46,34 @@ export const Stack = forwardRef<HTMLDivElement, StackProps>(
|
|
|
46
46
|
) => {
|
|
47
47
|
const [stackElement, stackRef] = useState<HTMLDivElement | null>(null);
|
|
48
48
|
const composedItemRef = composeRefs<HTMLDivElement>(stackRef, forwardedRef);
|
|
49
|
-
const [dropping, setDropping] = useState(false);
|
|
50
|
-
|
|
51
49
|
const arrowNavigationGroup = useArrowNavigationGroup({ axis: orientation });
|
|
52
50
|
|
|
53
51
|
const styles: CSSProperties = {
|
|
54
|
-
[orientation === 'horizontal' ? 'gridTemplateColumns' : 'gridTemplateRows']:
|
|
52
|
+
[orientation === 'horizontal' ? 'gridTemplateColumns' : 'gridTemplateRows']:
|
|
53
|
+
`repeat(${itemsCount}, min-content) [tabster-dummies] 0`,
|
|
55
54
|
...style,
|
|
56
55
|
};
|
|
57
56
|
|
|
58
57
|
const selfDroppable = !!(itemsCount < 1 && onRearrange && props.id);
|
|
59
58
|
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
59
|
+
const { dropping } = useStackDropForElements({
|
|
60
|
+
id: props.id,
|
|
61
|
+
element: stackElement,
|
|
62
|
+
selfDroppable,
|
|
63
|
+
orientation,
|
|
64
|
+
onRearrange,
|
|
65
|
+
});
|
|
66
|
+
|
|
67
|
+
const gridClasses = useMemo(() => {
|
|
68
|
+
if (!rail) {
|
|
69
|
+
return orientation === 'horizontal' ? 'grid-rows-1 pli-1' : 'grid-cols-1 plb-1';
|
|
63
70
|
}
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
{ input, element, allowedEdges: [orientation === 'horizontal' ? 'left' : 'top'] },
|
|
71
|
-
);
|
|
72
|
-
},
|
|
73
|
-
onDragEnter: ({ source }) => {
|
|
74
|
-
if (source.data.type === acceptSourceType) {
|
|
75
|
-
setDropping(true);
|
|
76
|
-
}
|
|
77
|
-
},
|
|
78
|
-
onDrag: ({ source }) => {
|
|
79
|
-
if (source.data.type === acceptSourceType) {
|
|
80
|
-
setDropping(true);
|
|
81
|
-
}
|
|
82
|
-
},
|
|
83
|
-
onDragLeave: () => setDropping(false),
|
|
84
|
-
onDrop: ({ self, source }) => {
|
|
85
|
-
setDropping(false);
|
|
86
|
-
if (source.data.type === acceptSourceType && selfDroppable) {
|
|
87
|
-
onRearrange(source.data as StackItemData, self.data as StackItemData, extractClosestEdge(self.data));
|
|
88
|
-
}
|
|
89
|
-
},
|
|
90
|
-
});
|
|
91
|
-
}, [stackElement, selfDroppable]);
|
|
71
|
+
if (orientation === 'horizontal') {
|
|
72
|
+
return size === 'contain-fit-content' ? railGridHorizontalContainFitContent : railGridHorizontal;
|
|
73
|
+
} else {
|
|
74
|
+
return size === 'contain-fit-content' ? railGridVerticalContainFitContent : railGridVertical;
|
|
75
|
+
}
|
|
76
|
+
}, [rail, orientation, size]);
|
|
92
77
|
|
|
93
78
|
return (
|
|
94
79
|
<StackContext.Provider value={{ orientation, rail, size, onRearrange }}>
|
|
@@ -97,25 +82,27 @@ export const Stack = forwardRef<HTMLDivElement, StackProps>(
|
|
|
97
82
|
{...arrowNavigationGroup}
|
|
98
83
|
className={mx(
|
|
99
84
|
'grid relative',
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
? railGridHorizontal
|
|
103
|
-
: railGridVertical
|
|
104
|
-
: orientation === 'horizontal'
|
|
105
|
-
? 'grid-rows-1'
|
|
106
|
-
: 'grid-cols-1',
|
|
107
|
-
size === 'contain' &&
|
|
85
|
+
gridClasses,
|
|
86
|
+
(size === 'contain' || size === 'contain-fit-content') &&
|
|
108
87
|
(orientation === 'horizontal'
|
|
109
88
|
? 'overflow-x-auto min-bs-0 bs-full max-bs-full'
|
|
110
89
|
: 'overflow-y-auto min-is-0 is-full max-is-full'),
|
|
111
90
|
classNames,
|
|
112
91
|
)}
|
|
92
|
+
data-rail={rail}
|
|
113
93
|
aria-orientation={orientation}
|
|
114
94
|
style={styles}
|
|
115
95
|
ref={composedItemRef}
|
|
116
96
|
>
|
|
117
97
|
{children}
|
|
118
|
-
{selfDroppable && dropping &&
|
|
98
|
+
{selfDroppable && dropping && (
|
|
99
|
+
<ListItem.DropIndicator
|
|
100
|
+
lineInset={8}
|
|
101
|
+
terminalInset={-8}
|
|
102
|
+
gap={-8}
|
|
103
|
+
edge={orientation === 'horizontal' ? 'left' : 'top'}
|
|
104
|
+
/>
|
|
105
|
+
)}
|
|
119
106
|
</div>
|
|
120
107
|
</StackContext.Provider>
|
|
121
108
|
);
|
|
@@ -5,9 +5,11 @@
|
|
|
5
5
|
import type { Edge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge';
|
|
6
6
|
import { createContext, useContext } from 'react';
|
|
7
7
|
|
|
8
|
+
import { type Size as DndSize } from '@dxos/react-ui-dnd';
|
|
9
|
+
|
|
8
10
|
import { type Orientation, type Size } from './Stack';
|
|
9
11
|
|
|
10
|
-
export type StackItemSize =
|
|
12
|
+
export type StackItemSize = DndSize;
|
|
11
13
|
|
|
12
14
|
export type StackItemData = { id: string; type: 'column' | 'card' };
|
|
13
15
|
|
|
@@ -16,6 +16,7 @@ import { composeRefs } from '@radix-ui/react-compose-refs';
|
|
|
16
16
|
import React, { forwardRef, useLayoutEffect, useState, type ComponentPropsWithRef, useCallback } from 'react';
|
|
17
17
|
|
|
18
18
|
import { type ThemedClassName, ListItem } from '@dxos/react-ui';
|
|
19
|
+
import { resizeAttributes, sizeStyle } from '@dxos/react-ui-dnd';
|
|
19
20
|
import { mx } from '@dxos/react-ui-theme';
|
|
20
21
|
|
|
21
22
|
import { useStack, StackItemContext, type StackItemSize, type StackItemData } from './StackContext';
|
|
@@ -47,11 +48,24 @@ export type StackItemRootProps = ThemedClassName<ComponentPropsWithRef<'div'>> &
|
|
|
47
48
|
onSizeChange?: (nextSize: StackItemSize) => void;
|
|
48
49
|
role?: 'article' | 'section';
|
|
49
50
|
disableRearrange?: boolean;
|
|
51
|
+
focusIndicatorVariant?: 'over-all' | 'group';
|
|
50
52
|
};
|
|
51
53
|
|
|
52
54
|
const StackItemRoot = forwardRef<HTMLDivElement, StackItemRootProps>(
|
|
53
55
|
(
|
|
54
|
-
{
|
|
56
|
+
{
|
|
57
|
+
item,
|
|
58
|
+
children,
|
|
59
|
+
classNames,
|
|
60
|
+
size: propsSize,
|
|
61
|
+
onSizeChange,
|
|
62
|
+
role,
|
|
63
|
+
order,
|
|
64
|
+
style,
|
|
65
|
+
disableRearrange,
|
|
66
|
+
focusIndicatorVariant = 'over-all',
|
|
67
|
+
...props
|
|
68
|
+
},
|
|
55
69
|
forwardedRef,
|
|
56
70
|
) => {
|
|
57
71
|
const [itemElement, itemRef] = useState<HTMLDivElement | null>(null);
|
|
@@ -96,6 +110,10 @@ const StackItemRoot = forwardRef<HTMLDivElement, StackItemRootProps>(
|
|
|
96
110
|
},
|
|
97
111
|
onDragStart: () => {
|
|
98
112
|
document.body.removeAttribute('data-drag-preview');
|
|
113
|
+
itemElement?.closest('[data-drag-autoscroll]')?.setAttribute('data-drag-autoscroll', 'active');
|
|
114
|
+
},
|
|
115
|
+
onDrop: () => {
|
|
116
|
+
itemElement?.closest('[data-drag-autoscroll]')?.setAttribute('data-drag-autoscroll', 'idle');
|
|
99
117
|
},
|
|
100
118
|
}),
|
|
101
119
|
dropTargetForElements({
|
|
@@ -136,17 +154,20 @@ const StackItemRoot = forwardRef<HTMLDivElement, StackItemRootProps>(
|
|
|
136
154
|
tabIndex={0}
|
|
137
155
|
{...focusGroupAttrs}
|
|
138
156
|
className={mx(
|
|
139
|
-
'group/stack-item grid relative
|
|
140
|
-
|
|
157
|
+
'group/stack-item grid relative',
|
|
158
|
+
focusIndicatorVariant === 'over-all'
|
|
159
|
+
? 'dx-focus-ring-inset-over-all'
|
|
160
|
+
: orientation === 'horizontal'
|
|
161
|
+
? 'dx-focus-ring-group-x'
|
|
162
|
+
: 'dx-focus-ring-group-y',
|
|
141
163
|
orientation === 'horizontal' ? 'grid-rows-subgrid' : 'grid-cols-subgrid',
|
|
142
164
|
rail && (orientation === 'horizontal' ? 'row-span-2' : 'col-span-2'),
|
|
143
165
|
classNames,
|
|
144
166
|
)}
|
|
145
167
|
data-dx-stack-item
|
|
168
|
+
{...resizeAttributes}
|
|
146
169
|
style={{
|
|
147
|
-
...(size
|
|
148
|
-
[orientation === 'horizontal' ? 'inlineSize' : 'blockSize']: `${size}rem`,
|
|
149
|
-
}),
|
|
170
|
+
...sizeStyle(size, orientation),
|
|
150
171
|
...(Number.isFinite(order) && {
|
|
151
172
|
[orientation === 'horizontal' ? 'gridColumn' : 'gridRow']: `${order}`,
|
|
152
173
|
}),
|
|
@@ -155,7 +176,7 @@ const StackItemRoot = forwardRef<HTMLDivElement, StackItemRootProps>(
|
|
|
155
176
|
ref={composedItemRef}
|
|
156
177
|
>
|
|
157
178
|
{children}
|
|
158
|
-
{closestEdge && <ListItem.DropIndicator edge={closestEdge} />}
|
|
179
|
+
{closestEdge && <ListItem.DropIndicator lineInset={8} terminalInset={-8} edge={closestEdge} />}
|
|
159
180
|
</Root>
|
|
160
181
|
</StackItemContext.Provider>
|
|
161
182
|
);
|
|
@@ -15,10 +15,12 @@ export type StackItemContentProps = ThemedClassName<ComponentPropsWithoutRef<'di
|
|
|
15
15
|
* (`row-span-2`) or was buggy. See the description of the StackItem.Content component itself for more information.
|
|
16
16
|
*/
|
|
17
17
|
toolbar: boolean;
|
|
18
|
+
|
|
18
19
|
/**
|
|
19
20
|
* Whether to provide for the layout of a statusbar after the content.
|
|
20
21
|
*/
|
|
21
22
|
statusbar?: boolean;
|
|
23
|
+
|
|
22
24
|
/**
|
|
23
25
|
* Whether to set a certain aspect ratio on the content, including the toolbar and statusbar. This is provided for
|
|
24
26
|
* convenience and consistency; it can instead be specified by the `classNames` or `style` props as needed.
|
|
@@ -2,126 +2,29 @@
|
|
|
2
2
|
// Copyright 2024 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import
|
|
6
|
-
import { disableNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/element/disable-native-drag-preview';
|
|
7
|
-
import { preventUnhandled } from '@atlaskit/pragmatic-drag-and-drop/prevent-unhandled';
|
|
8
|
-
import { type DragLocationHistory } from '@atlaskit/pragmatic-drag-and-drop/types';
|
|
9
|
-
import React, { useLayoutEffect, useRef } from 'react';
|
|
5
|
+
import React from 'react';
|
|
10
6
|
|
|
11
|
-
import {
|
|
7
|
+
import { ResizeHandle } from '@dxos/react-ui-dnd';
|
|
12
8
|
|
|
13
|
-
import { useStack, useStackItem
|
|
9
|
+
import { useStack, useStackItem } from './StackContext';
|
|
14
10
|
import { DEFAULT_EXTRINSIC_SIZE } from './StackItem';
|
|
15
11
|
|
|
16
|
-
const REM = parseFloat(getComputedStyle(document.documentElement).fontSize);
|
|
17
|
-
|
|
18
12
|
const MIN_WIDTH = 20;
|
|
19
13
|
const MIN_HEIGHT = 3;
|
|
20
14
|
|
|
21
|
-
const measureStackItem = (element: HTMLButtonElement): { width: number; height: number } => {
|
|
22
|
-
const stackItemElement = element.closest('[data-dx-stack-item]');
|
|
23
|
-
return stackItemElement?.getBoundingClientRect() ?? { width: DEFAULT_EXTRINSIC_SIZE, height: DEFAULT_EXTRINSIC_SIZE };
|
|
24
|
-
};
|
|
25
|
-
|
|
26
|
-
const getNextSize = (startSize: number, location: DragLocationHistory, client: 'clientX' | 'clientY') => {
|
|
27
|
-
return Math.max(
|
|
28
|
-
client === 'clientX' ? MIN_WIDTH : MIN_HEIGHT,
|
|
29
|
-
startSize + (location.current.input[client] - location.initial.input[client]) / REM,
|
|
30
|
-
);
|
|
31
|
-
};
|
|
32
|
-
|
|
33
15
|
export type StackItemResizeHandleProps = {};
|
|
34
16
|
|
|
35
17
|
export const StackItemResizeHandle = () => {
|
|
36
18
|
const { orientation } = useStack();
|
|
37
19
|
const { setSize, size } = useStackItem();
|
|
38
|
-
const buttonRef = useRef<HTMLButtonElement>(null);
|
|
39
|
-
const dragStartSize = useRef<StackItemSize>(size);
|
|
40
|
-
const client = orientation === 'horizontal' ? 'clientX' : 'clientY';
|
|
41
|
-
|
|
42
|
-
useLayoutEffect(
|
|
43
|
-
() => {
|
|
44
|
-
if (!buttonRef.current || buttonRef.current.hasAttribute('draggable')) {
|
|
45
|
-
return;
|
|
46
|
-
}
|
|
47
|
-
// TODO(thure): This should handle StackItem state vs local state better.
|
|
48
|
-
draggable({
|
|
49
|
-
element: buttonRef.current,
|
|
50
|
-
onGenerateDragPreview: ({ nativeSetDragImage }) => {
|
|
51
|
-
// We will be moving the line to indicate a drag; we can disable the native drag preview.
|
|
52
|
-
disableNativeDragPreview({ nativeSetDragImage });
|
|
53
|
-
// We don't want any native drop animation for when the user does not drop on a drop target.
|
|
54
|
-
// We want the drag to finish immediately.
|
|
55
|
-
preventUnhandled.start();
|
|
56
|
-
},
|
|
57
|
-
onDragStart: () => {
|
|
58
|
-
dragStartSize.current =
|
|
59
|
-
dragStartSize.current === 'min-content'
|
|
60
|
-
? measureStackItem(buttonRef.current!)[orientation === 'horizontal' ? 'width' : 'height'] / REM
|
|
61
|
-
: dragStartSize.current;
|
|
62
|
-
},
|
|
63
|
-
onDrag: ({ location }) => {
|
|
64
|
-
if (typeof dragStartSize.current !== 'number') {
|
|
65
|
-
return;
|
|
66
|
-
}
|
|
67
|
-
setSize(getNextSize(dragStartSize.current, location, client));
|
|
68
|
-
},
|
|
69
|
-
onDrop: ({ location }) => {
|
|
70
|
-
if (typeof dragStartSize.current !== 'number') {
|
|
71
|
-
return;
|
|
72
|
-
}
|
|
73
|
-
const nextSize = getNextSize(dragStartSize.current, location, client);
|
|
74
|
-
setSize(nextSize, true);
|
|
75
|
-
dragStartSize.current = nextSize;
|
|
76
|
-
},
|
|
77
|
-
});
|
|
78
|
-
},
|
|
79
|
-
[
|
|
80
|
-
// Note that `size` should not be a dependency here since dragging this adjusts the size.
|
|
81
|
-
],
|
|
82
|
-
);
|
|
83
|
-
|
|
84
|
-
return (
|
|
85
|
-
<button
|
|
86
|
-
ref={buttonRef}
|
|
87
|
-
className={mx(
|
|
88
|
-
'group absolute',
|
|
89
|
-
orientation === 'horizontal'
|
|
90
|
-
? 'cursor-col-resize is-3 bs-full inline-end-[-1px] !border-lb-0 before:inset-block-0 before:inline-end-0 before:is-1'
|
|
91
|
-
: 'cursor-row-resize bs-3 is-full block-end-[-1px] !border-li-0 before:inset-inline-0 before:block-end-0 before:bs-1',
|
|
92
|
-
'before:transition-opacity before:duration-100 before:ease-in-out before:opacity-0 hover:before:opacity-100 focus-visible:before:opacity-100 active:before:opacity-100',
|
|
93
|
-
'before:absolute before:block before:bg-accentFocusIndicator',
|
|
94
|
-
)}
|
|
95
|
-
>
|
|
96
|
-
<div
|
|
97
|
-
role='none'
|
|
98
|
-
className={mx(
|
|
99
|
-
'absolute flex items-center group-hover:opacity-0 group-focus-visible:opacity-0 group-active:opacity-0',
|
|
100
|
-
orientation === 'horizontal'
|
|
101
|
-
? 'block-start-0 inline-end-px bs-[--rail-size]'
|
|
102
|
-
: 'inline-start-0 block-end-px is-[--rail-size] flex justify-center',
|
|
103
|
-
)}
|
|
104
|
-
>
|
|
105
|
-
<DragHandleSignifier orientation={orientation} />
|
|
106
|
-
</div>
|
|
107
|
-
</button>
|
|
108
|
-
);
|
|
109
|
-
};
|
|
110
20
|
|
|
111
|
-
const DragHandleSignifier = ({ orientation }: { orientation: 'horizontal' | 'vertical' }) => {
|
|
112
21
|
return (
|
|
113
|
-
<
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
<path d='M256,232c-8.8,0-16-7.2-16-16v-56c0-8.8,7.2-16,16-16v88Z' /> */}
|
|
121
|
-
<path d='M256,64c-8.8,0-16-7.2-16-16s7.2-16,16-16v32Z' />
|
|
122
|
-
<path d='M256,120c-8.8,0-16-7.2-16-16s7.2-16,16-16v32Z' />
|
|
123
|
-
<path d='M256,176c-8.8,0-16-7.2-16-16s7.2-16,16-16v32Z' />
|
|
124
|
-
<path d='M256,232c-8.8,0-16-7.2-16-16s7.2-16,16-16v32Z' />
|
|
125
|
-
</svg>
|
|
22
|
+
<ResizeHandle
|
|
23
|
+
side={orientation === 'horizontal' ? 'inline-end' : 'block-end'}
|
|
24
|
+
fallbackSize={DEFAULT_EXTRINSIC_SIZE}
|
|
25
|
+
minSize={orientation === 'horizontal' ? MIN_WIDTH : MIN_HEIGHT}
|
|
26
|
+
size={size}
|
|
27
|
+
onSizeChange={setSize}
|
|
28
|
+
/>
|
|
126
29
|
);
|
|
127
30
|
};
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
//
|
|
2
|
+
// Copyright 2025 DXOS.org
|
|
3
|
+
//
|
|
4
|
+
|
|
5
|
+
import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
|
|
6
|
+
import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
|
|
7
|
+
import { autoScrollForElements } from '@atlaskit/pragmatic-drag-and-drop-auto-scroll/element';
|
|
8
|
+
import { attachClosestEdge, extractClosestEdge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge';
|
|
9
|
+
import { useLayoutEffect, useState } from 'react';
|
|
10
|
+
|
|
11
|
+
import { type Orientation } from '../components/Stack';
|
|
12
|
+
import { type StackItemRearrangeHandler, type StackItemData } from '../components/StackContext';
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* Hook to handle drag and drop functionality for Stack components.
|
|
16
|
+
*/
|
|
17
|
+
export const useStackDropForElements = ({
|
|
18
|
+
element,
|
|
19
|
+
selfDroppable,
|
|
20
|
+
orientation,
|
|
21
|
+
id,
|
|
22
|
+
onRearrange,
|
|
23
|
+
}: {
|
|
24
|
+
element: HTMLDivElement | null;
|
|
25
|
+
selfDroppable: boolean;
|
|
26
|
+
orientation: Orientation;
|
|
27
|
+
id?: string;
|
|
28
|
+
onRearrange?: StackItemRearrangeHandler;
|
|
29
|
+
}) => {
|
|
30
|
+
const [dropping, setDropping] = useState(false);
|
|
31
|
+
|
|
32
|
+
useLayoutEffect(() => {
|
|
33
|
+
if (!element || !selfDroppable) {
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
const acceptSourceType = orientation === 'horizontal' ? 'column' : 'card';
|
|
38
|
+
|
|
39
|
+
return combine(
|
|
40
|
+
dropTargetForElements({
|
|
41
|
+
element,
|
|
42
|
+
getData: ({ input, element }) => {
|
|
43
|
+
return attachClosestEdge(
|
|
44
|
+
{ id, type: orientation === 'horizontal' ? 'card' : 'column' },
|
|
45
|
+
{ input, element, allowedEdges: [orientation === 'horizontal' ? 'left' : 'top'] },
|
|
46
|
+
);
|
|
47
|
+
},
|
|
48
|
+
onDragEnter: ({ source }) => {
|
|
49
|
+
if (source.data.type === acceptSourceType) {
|
|
50
|
+
setDropping(true);
|
|
51
|
+
}
|
|
52
|
+
},
|
|
53
|
+
onDrag: ({ source }) => {
|
|
54
|
+
if (source.data.type === acceptSourceType) {
|
|
55
|
+
setDropping(true);
|
|
56
|
+
}
|
|
57
|
+
},
|
|
58
|
+
onDragLeave: () => {
|
|
59
|
+
return setDropping(false);
|
|
60
|
+
},
|
|
61
|
+
onDrop: ({ self, source }) => {
|
|
62
|
+
setDropping(false);
|
|
63
|
+
if (source.data.type === acceptSourceType && selfDroppable && onRearrange) {
|
|
64
|
+
onRearrange(source.data as StackItemData, self.data as StackItemData, extractClosestEdge(self.data));
|
|
65
|
+
}
|
|
66
|
+
},
|
|
67
|
+
}),
|
|
68
|
+
autoScrollForElements({ element, getAllowedAxis: () => orientation }),
|
|
69
|
+
);
|
|
70
|
+
}, [element, selfDroppable, orientation, id, onRearrange]);
|
|
71
|
+
|
|
72
|
+
return { dropping };
|
|
73
|
+
};
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"playwright.config.d.ts","sourceRoot":"","sources":["../../../../src/playwright/playwright.config.ts"],"names":[],"mappings":";AASA,wBAQG"}
|
|
File without changes
|