@multiplatform.one/table 7.69.2 → 7.71.0
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/DataTable/DataTableCardControls.cjs +74 -12
- package/dist/cjs/components/DataTable/DataTableCardControls.native.js +83 -12
- package/dist/cjs/components/DataTable/DataTableCardControls.native.js.map +1 -1
- package/dist/cjs/components/DataTable/DataTableDocumentList.cjs +180 -114
- package/dist/cjs/components/DataTable/DataTableDocumentList.native.js +193 -124
- package/dist/cjs/components/DataTable/DataTableDocumentList.native.js.map +1 -1
- package/dist/cjs/components/DataTable/DataTableMobileCards.cjs +260 -127
- package/dist/cjs/components/DataTable/DataTableMobileCards.native.js +287 -156
- package/dist/cjs/components/DataTable/DataTableMobileCards.native.js.map +1 -1
- package/dist/cjs/components/DataTable/DataTableRoot.cjs +34 -5
- package/dist/cjs/components/DataTable/DataTableRoot.native.js +36 -5
- package/dist/cjs/components/DataTable/DataTableRoot.native.js.map +1 -1
- package/dist/cjs/components/DataTable/PhonePager.cjs +56 -0
- package/dist/cjs/components/DataTable/PhonePager.native.js +60 -0
- package/dist/cjs/components/DataTable/PhonePager.native.js.map +1 -0
- package/dist/cjs/components/DataTable/index.native.js +64 -7
- package/dist/cjs/components/DataTable/index.native.js.map +1 -1
- package/dist/cjs/components/DataTable/rowSlotParts.cjs +158 -0
- package/dist/cjs/components/DataTable/rowSlotParts.native.js +170 -0
- package/dist/cjs/components/DataTable/rowSlotParts.native.js.map +1 -0
- package/dist/cjs/components/DataTable/rowSlots.cjs +150 -0
- package/dist/cjs/components/DataTable/rowSlots.native.js +239 -0
- package/dist/cjs/components/DataTable/rowSlots.native.js.map +1 -0
- package/dist/cjs/components/DataTableFilterButton/index.cjs +25 -3
- package/dist/cjs/components/DataTableFilterButton/index.native.js +25 -3
- package/dist/cjs/components/DataTableFilterButton/index.native.js.map +1 -1
- package/dist/cjs/components/DataTablePagination/index.cjs +23 -0
- package/dist/cjs/components/DataTablePagination/index.native.js +25 -0
- package/dist/cjs/components/DataTablePagination/index.native.js.map +1 -1
- package/dist/cjs/components/DataTableToolbar/glyph.cjs +54 -0
- package/dist/cjs/components/DataTableToolbar/glyph.native.js +57 -0
- package/dist/cjs/components/DataTableToolbar/glyph.native.js.map +1 -0
- package/dist/cjs/components/DataTableToolbar/index.cjs +206 -114
- package/dist/cjs/components/DataTableToolbar/index.native.js +217 -112
- package/dist/cjs/components/DataTableToolbar/index.native.js.map +1 -1
- package/dist/cjs/index.cjs +5 -1
- package/dist/cjs/index.native.js +5 -1
- package/dist/cjs/index.native.js.map +1 -1
- package/dist/esm/components/DataTable/DataTableCardControls.mjs +74 -13
- package/dist/esm/components/DataTable/DataTableCardControls.mjs.map +1 -1
- package/dist/esm/components/DataTable/DataTableCardControls.native.js +83 -13
- package/dist/esm/components/DataTable/DataTableCardControls.native.js.map +1 -1
- package/dist/esm/components/DataTable/DataTableDocumentList.mjs +179 -113
- package/dist/esm/components/DataTable/DataTableDocumentList.mjs.map +1 -1
- package/dist/esm/components/DataTable/DataTableDocumentList.native.js +192 -123
- package/dist/esm/components/DataTable/DataTableDocumentList.native.js.map +1 -1
- package/dist/esm/components/DataTable/DataTableMobileCards.mjs +261 -129
- package/dist/esm/components/DataTable/DataTableMobileCards.mjs.map +1 -1
- package/dist/esm/components/DataTable/DataTableMobileCards.native.js +288 -158
- package/dist/esm/components/DataTable/DataTableMobileCards.native.js.map +1 -1
- package/dist/esm/components/DataTable/DataTableRoot.mjs +36 -7
- package/dist/esm/components/DataTable/DataTableRoot.mjs.map +1 -1
- package/dist/esm/components/DataTable/DataTableRoot.native.js +38 -7
- package/dist/esm/components/DataTable/DataTableRoot.native.js.map +1 -1
- package/dist/esm/components/DataTable/PhonePager.mjs +31 -0
- package/dist/esm/components/DataTable/PhonePager.mjs.map +1 -0
- package/dist/esm/components/DataTable/PhonePager.native.js +32 -0
- package/dist/esm/components/DataTable/PhonePager.native.js.map +1 -0
- package/dist/esm/components/DataTable/index.native.js +67 -10
- package/dist/esm/components/DataTable/index.native.js.map +1 -1
- package/dist/esm/components/DataTable/rowSlotParts.mjs +130 -0
- package/dist/esm/components/DataTable/rowSlotParts.mjs.map +1 -0
- package/dist/esm/components/DataTable/rowSlotParts.native.js +139 -0
- package/dist/esm/components/DataTable/rowSlotParts.native.js.map +1 -0
- package/dist/esm/components/DataTable/rowSlots.mjs +121 -0
- package/dist/esm/components/DataTable/rowSlots.mjs.map +1 -0
- package/dist/esm/components/DataTable/rowSlots.native.js +207 -0
- package/dist/esm/components/DataTable/rowSlots.native.js.map +1 -0
- package/dist/esm/components/DataTableFilterButton/index.mjs +24 -3
- package/dist/esm/components/DataTableFilterButton/index.mjs.map +1 -1
- package/dist/esm/components/DataTableFilterButton/index.native.js +24 -3
- package/dist/esm/components/DataTableFilterButton/index.native.js.map +1 -1
- package/dist/esm/components/DataTablePagination/index.mjs +23 -0
- package/dist/esm/components/DataTablePagination/index.mjs.map +1 -1
- package/dist/esm/components/DataTablePagination/index.native.js +25 -0
- package/dist/esm/components/DataTablePagination/index.native.js.map +1 -1
- package/dist/esm/components/DataTableToolbar/glyph.mjs +27 -0
- package/dist/esm/components/DataTableToolbar/glyph.mjs.map +1 -0
- package/dist/esm/components/DataTableToolbar/glyph.native.js +27 -0
- package/dist/esm/components/DataTableToolbar/glyph.native.js.map +1 -0
- package/dist/esm/components/DataTableToolbar/index.mjs +211 -119
- package/dist/esm/components/DataTableToolbar/index.mjs.map +1 -1
- package/dist/esm/components/DataTableToolbar/index.native.js +222 -117
- package/dist/esm/components/DataTableToolbar/index.native.js.map +1 -1
- package/dist/esm/index.mjs +2 -1
- package/dist/esm/index.mjs.map +1 -1
- package/dist/esm/index.native.js +2 -1
- package/dist/esm/index.native.js.map +1 -1
- package/dist/jsx/components/DataTable/DataTableCardControls.mjs +74 -13
- package/dist/jsx/components/DataTable/DataTableCardControls.mjs.map +1 -1
- package/dist/jsx/components/DataTable/DataTableCardControls.native.js +83 -12
- package/dist/jsx/components/DataTable/DataTableCardControls.native.js.map +1 -1
- package/dist/jsx/components/DataTable/DataTableDocumentList.mjs +179 -113
- package/dist/jsx/components/DataTable/DataTableDocumentList.mjs.map +1 -1
- package/dist/jsx/components/DataTable/DataTableDocumentList.native.js +193 -124
- package/dist/jsx/components/DataTable/DataTableDocumentList.native.js.map +1 -1
- package/dist/jsx/components/DataTable/DataTableMobileCards.mjs +261 -129
- package/dist/jsx/components/DataTable/DataTableMobileCards.mjs.map +1 -1
- package/dist/jsx/components/DataTable/DataTableMobileCards.native.js +287 -156
- package/dist/jsx/components/DataTable/DataTableMobileCards.native.js.map +1 -1
- package/dist/jsx/components/DataTable/DataTableRoot.mjs +36 -7
- package/dist/jsx/components/DataTable/DataTableRoot.mjs.map +1 -1
- package/dist/jsx/components/DataTable/DataTableRoot.native.js +36 -5
- package/dist/jsx/components/DataTable/DataTableRoot.native.js.map +1 -1
- package/dist/jsx/components/DataTable/PhonePager.mjs +31 -0
- package/dist/jsx/components/DataTable/PhonePager.mjs.map +1 -0
- package/dist/jsx/components/DataTable/PhonePager.native.js +60 -0
- package/dist/jsx/components/DataTable/PhonePager.native.js.map +1 -0
- package/dist/jsx/components/DataTable/index.native.js +64 -7
- package/dist/jsx/components/DataTable/index.native.js.map +1 -1
- package/dist/jsx/components/DataTable/rowSlotParts.mjs +130 -0
- package/dist/jsx/components/DataTable/rowSlotParts.mjs.map +1 -0
- package/dist/jsx/components/DataTable/rowSlotParts.native.js +170 -0
- package/dist/jsx/components/DataTable/rowSlotParts.native.js.map +1 -0
- package/dist/jsx/components/DataTable/rowSlots.mjs +121 -0
- package/dist/jsx/components/DataTable/rowSlots.mjs.map +1 -0
- package/dist/jsx/components/DataTable/rowSlots.native.js +239 -0
- package/dist/jsx/components/DataTable/rowSlots.native.js.map +1 -0
- package/dist/jsx/components/DataTableFilterButton/index.mjs +24 -3
- package/dist/jsx/components/DataTableFilterButton/index.mjs.map +1 -1
- package/dist/jsx/components/DataTableFilterButton/index.native.js +25 -3
- package/dist/jsx/components/DataTableFilterButton/index.native.js.map +1 -1
- package/dist/jsx/components/DataTablePagination/index.mjs +23 -0
- package/dist/jsx/components/DataTablePagination/index.mjs.map +1 -1
- package/dist/jsx/components/DataTablePagination/index.native.js +25 -0
- package/dist/jsx/components/DataTablePagination/index.native.js.map +1 -1
- package/dist/jsx/components/DataTableToolbar/glyph.mjs +27 -0
- package/dist/jsx/components/DataTableToolbar/glyph.mjs.map +1 -0
- package/dist/jsx/components/DataTableToolbar/glyph.native.js +57 -0
- package/dist/jsx/components/DataTableToolbar/glyph.native.js.map +1 -0
- package/dist/jsx/components/DataTableToolbar/index.mjs +211 -119
- package/dist/jsx/components/DataTableToolbar/index.mjs.map +1 -1
- package/dist/jsx/components/DataTableToolbar/index.native.js +217 -112
- package/dist/jsx/components/DataTableToolbar/index.native.js.map +1 -1
- package/dist/jsx/index.js +2 -1
- package/dist/jsx/index.js.map +1 -1
- package/dist/jsx/index.mjs +2 -1
- package/dist/jsx/index.mjs.map +1 -1
- package/dist/jsx/index.native.js +5 -1
- package/dist/jsx/index.native.js.map +1 -1
- package/package.json +12 -12
- package/src/components/DataTable/DataTable.spec.tsx +12 -9
- package/src/components/DataTable/DataTable.stories.tsx +110 -43
- package/src/components/DataTable/DataTableCardControls.tsx +103 -24
- package/src/components/DataTable/DataTableDocumentList.stories.tsx +113 -0
- package/src/components/DataTable/DataTableDocumentList.tsx +210 -120
- package/src/components/DataTable/DataTableMobileCards.tsx +280 -147
- package/src/components/DataTable/DataTableRoot.tsx +56 -5
- package/src/components/DataTable/PhonePager.tsx +44 -0
- package/src/components/DataTable/cardLayout.spec.tsx +20 -12
- package/src/components/DataTable/cardToolbar.spec.tsx +31 -26
- package/src/components/DataTable/dataTableCardControls.spec.tsx +10 -9
- package/src/components/DataTable/dataTableDocumentList.spec.tsx +98 -10
- package/src/components/DataTable/dataTableMobileCards.spec.tsx +29 -14
- package/src/components/DataTable/index.native.tsx +90 -9
- package/src/components/DataTable/nativeCardParity.spec.tsx +15 -0
- package/src/components/DataTable/pageRange.spec.tsx +12 -1
- package/src/components/DataTable/rowSlotParts.tsx +184 -0
- package/src/components/DataTable/rowSlots.ts +239 -0
- package/src/components/DataTable/smallTableFooter.spec.tsx +10 -0
- package/src/components/DataTableFilterButton/DataTableFilterButton.spec.tsx +3 -3
- package/src/components/DataTableFilterButton/index.tsx +30 -2
- package/src/components/DataTablePagination/index.tsx +30 -0
- package/src/components/DataTableToolbar/DataTableToolbar.spec.tsx +10 -0
- package/src/components/DataTableToolbar/DataTableToolbar.stories.tsx +16 -7
- package/src/components/DataTableToolbar/compactRow.spec.tsx +197 -0
- package/src/components/DataTableToolbar/glyph.ts +33 -0
- package/src/components/DataTableToolbar/index.tsx +269 -131
- package/src/components/Table/accessibility.spec.tsx +4 -3
- package/src/components/noMiddotJoin.spec.tsx +315 -0
- package/src/components/phoneBottomAccessory.spec.tsx +218 -0
- package/src/components/phoneCardPolish.spec.tsx +214 -0
- package/src/components/phoneCardsDefault.spec.tsx +34 -6
- package/src/components/phonePager.spec.tsx +141 -0
- package/src/components/tableDropdowns.spec.tsx +4 -3
- package/src/index.ts +5 -0
- package/src/types.ts +23 -0
- package/types/components/DataTable/DataTableCardControls.d.ts +12 -0
- package/types/components/DataTable/DataTableCardControls.d.ts.map +1 -1
- package/types/components/DataTable/DataTableDocumentList.d.ts +13 -7
- package/types/components/DataTable/DataTableDocumentList.d.ts.map +1 -1
- package/types/components/DataTable/DataTableMobileCards.d.ts +38 -12
- package/types/components/DataTable/DataTableMobileCards.d.ts.map +1 -1
- package/types/components/DataTable/DataTableRoot.d.ts +1 -1
- package/types/components/DataTable/DataTableRoot.d.ts.map +1 -1
- package/types/components/DataTable/PhonePager.d.ts +24 -0
- package/types/components/DataTable/PhonePager.d.ts.map +1 -0
- package/types/components/DataTable/index.native.d.ts +1 -1
- package/types/components/DataTable/index.native.d.ts.map +1 -1
- package/types/components/DataTable/rowSlotParts.d.ts +30 -0
- package/types/components/DataTable/rowSlotParts.d.ts.map +1 -0
- package/types/components/DataTable/rowSlots.d.ts +74 -0
- package/types/components/DataTable/rowSlots.d.ts.map +1 -0
- package/types/components/DataTableFilterButton/index.d.ts +1 -0
- package/types/components/DataTableFilterButton/index.d.ts.map +1 -1
- package/types/components/DataTablePagination/index.d.ts +5 -0
- package/types/components/DataTablePagination/index.d.ts.map +1 -1
- package/types/components/DataTableToolbar/glyph.d.ts +65 -0
- package/types/components/DataTableToolbar/glyph.d.ts.map +1 -0
- package/types/components/DataTableToolbar/index.d.ts +24 -0
- package/types/components/DataTableToolbar/index.d.ts.map +1 -1
- package/types/index.d.ts +1 -0
- package/types/index.d.ts.map +1 -1
- package/types/types.d.ts +23 -0
- package/types/types.d.ts.map +1 -1
|
@@ -1,17 +1,32 @@
|
|
|
1
|
-
import { CaretDownIcon, FloppyDiskIcon } from "@phosphor-icons/react";
|
|
1
|
+
import { CaretDownIcon, DotsThreeIcon, FloppyDiskIcon } from "@phosphor-icons/react";
|
|
2
2
|
import { DropdownMenu, ActionButton } from "@multiplatform.one/components";
|
|
3
|
-
import {
|
|
4
|
-
|
|
3
|
+
import {
|
|
4
|
+
Button,
|
|
5
|
+
FloatingPanel,
|
|
6
|
+
Input,
|
|
7
|
+
SearchInput,
|
|
8
|
+
Spinner,
|
|
9
|
+
ToggleGroup,
|
|
10
|
+
} from "@multiplatform.one/forms";
|
|
11
|
+
import {
|
|
12
|
+
Surface,
|
|
13
|
+
hairline,
|
|
14
|
+
sizeRecipeForToken,
|
|
15
|
+
useResolvedKnobs,
|
|
16
|
+
useTouchSurface,
|
|
17
|
+
} from "@multiplatform.one/theme";
|
|
5
18
|
import { RovingFocusGroup } from "@tamagui/roving-focus";
|
|
6
19
|
import type React from "react";
|
|
7
20
|
import { useState } from "react";
|
|
8
|
-
import { XStack, YStack } from "tamagui";
|
|
21
|
+
import { XStack, YStack, useMedia } from "tamagui";
|
|
9
22
|
import { t } from "../../shared/t";
|
|
10
23
|
import type { TableView } from "../../types";
|
|
11
24
|
import { iconSizeForToken } from "../../utils/chromeIcons";
|
|
25
|
+
import { DataTableViewMenu } from "../DataTable/DataTableCardControls";
|
|
12
26
|
import { useDataTableState } from "../DataTable/DataTableStateContext";
|
|
13
27
|
import { DataTableExport } from "../DataTableExport";
|
|
14
|
-
import {
|
|
28
|
+
import { DataTableFilterButton, DataTableFilterGlyph } from "../DataTableFilterButton";
|
|
29
|
+
import { ToolbarGlyphFieldHeight, useToolbarGlyphProps } from "./glyph";
|
|
15
30
|
|
|
16
31
|
export interface DataTableToolbarProps {
|
|
17
32
|
// Search
|
|
@@ -40,11 +55,36 @@ export interface DataTableToolbarProps {
|
|
|
40
55
|
showFilterCount?: boolean;
|
|
41
56
|
showViewSelector?: boolean;
|
|
42
57
|
customActions?: React.ReactNode;
|
|
58
|
+
/**
|
|
59
|
+
* Glyph-sized controls that ride inside the compact search field beside
|
|
60
|
+
* Filter (the table's own Sort). `customActions` sit after the field there.
|
|
61
|
+
*/
|
|
62
|
+
fieldActions?: React.ReactNode;
|
|
43
63
|
/** Subtle refetch indicator — must not unmount the table body. */
|
|
44
64
|
isFetching?: boolean;
|
|
45
65
|
|
|
46
66
|
// Sizing
|
|
47
67
|
size?: string;
|
|
68
|
+
/**
|
|
69
|
+
* Draw the hairline under the toolbar. Default: true over a grid, whose
|
|
70
|
+
* header row starts right below it; false over a card list (FZ-7889),
|
|
71
|
+
* where the cards are their own surfaces and the toolbar's bottom padding
|
|
72
|
+
* is the gap.
|
|
73
|
+
*/
|
|
74
|
+
divider?: boolean;
|
|
75
|
+
/**
|
|
76
|
+
* Rows per page on a phone, where the pager is one row of dots (FZ-7889).
|
|
77
|
+
* It rides the More menu when the toolbar has one, else its own glyph, so
|
|
78
|
+
* the search field never carries more than three glyphs (FZ-8039).
|
|
79
|
+
*/
|
|
80
|
+
pageSize?: DataTablePageSizeChoice;
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
export interface DataTablePageSizeChoice {
|
|
84
|
+
value: number;
|
|
85
|
+
options: number[];
|
|
86
|
+
onChange: (pageSize: number) => void;
|
|
87
|
+
disabled?: boolean;
|
|
48
88
|
}
|
|
49
89
|
|
|
50
90
|
export function DataTableToolbar(props: DataTableToolbarProps) {
|
|
@@ -55,6 +95,30 @@ export function DataTableCardToolbar(props: DataTableToolbarProps) {
|
|
|
55
95
|
return <ToolbarLayout {...props} cardLayout />;
|
|
56
96
|
}
|
|
57
97
|
|
|
98
|
+
// React 19 hands `ref` and the asChild trigger props over in `trigger`.
|
|
99
|
+
function MoreGlyph({
|
|
100
|
+
size,
|
|
101
|
+
iconPx,
|
|
102
|
+
label,
|
|
103
|
+
...trigger
|
|
104
|
+
}: {
|
|
105
|
+
size: string;
|
|
106
|
+
iconPx: number;
|
|
107
|
+
label: string;
|
|
108
|
+
}) {
|
|
109
|
+
const glyphProps = useToolbarGlyphProps();
|
|
110
|
+
return (
|
|
111
|
+
<Button
|
|
112
|
+
{...glyphProps}
|
|
113
|
+
{...trigger}
|
|
114
|
+
size={size as never}
|
|
115
|
+
icon={<DotsThreeIcon size={iconPx} weight="bold" />}
|
|
116
|
+
aria-label={label}
|
|
117
|
+
aria-haspopup="dialog"
|
|
118
|
+
/>
|
|
119
|
+
);
|
|
120
|
+
}
|
|
121
|
+
|
|
58
122
|
function ToolbarLayout({
|
|
59
123
|
cardLayout = false,
|
|
60
124
|
...props
|
|
@@ -78,8 +142,11 @@ function ToolbarLayout({
|
|
|
78
142
|
showFilterCount: _showFilterCount = true,
|
|
79
143
|
showViewSelector = true,
|
|
80
144
|
customActions,
|
|
145
|
+
fieldActions,
|
|
81
146
|
size,
|
|
82
147
|
isFetching: isFetchingProp,
|
|
148
|
+
divider = !cardLayout,
|
|
149
|
+
pageSize,
|
|
83
150
|
} = props;
|
|
84
151
|
const isFetching = isFetchingProp ?? ctx?.state.isFetching ?? false;
|
|
85
152
|
|
|
@@ -89,7 +156,10 @@ function ToolbarLayout({
|
|
|
89
156
|
enableFiltering && !!ctx && (ctx.computed?.filterFields?.length ?? 0) > 0;
|
|
90
157
|
|
|
91
158
|
const [showSaveViewDialog, setShowSaveViewDialog] = useState(false);
|
|
159
|
+
const [showMore, setShowMore] = useState(false);
|
|
92
160
|
const [newViewName, setNewViewName] = useState("");
|
|
161
|
+
const { sm } = useMedia();
|
|
162
|
+
const compact = cardLayout || sm === false;
|
|
93
163
|
|
|
94
164
|
const activeView = views.find((v) => v.id === activeViewId);
|
|
95
165
|
|
|
@@ -98,6 +168,7 @@ function ToolbarLayout({
|
|
|
98
168
|
onSaveView(newViewName.trim());
|
|
99
169
|
setNewViewName("");
|
|
100
170
|
setShowSaveViewDialog(false);
|
|
171
|
+
setShowMore(false);
|
|
101
172
|
}
|
|
102
173
|
};
|
|
103
174
|
|
|
@@ -107,11 +178,13 @@ function ToolbarLayout({
|
|
|
107
178
|
const searchMaxWidth = sz === "$3" ? 280 : sz === "$5" ? 400 : 320;
|
|
108
179
|
const controlSize = knobProps.sizeToken;
|
|
109
180
|
const searchSize = knobProps.sizeToken;
|
|
181
|
+
const touch = useTouchSurface();
|
|
182
|
+
const fieldHeight = sizeRecipeForToken(String(searchSize), { touch }).height;
|
|
110
183
|
|
|
111
184
|
const showViewPicker = enableViews && showViewSelector && views.length > 0;
|
|
112
185
|
const showSave = enableViews && showViewSelector;
|
|
113
186
|
const showActionCluster = Boolean(
|
|
114
|
-
customActions || showFilterButton || showViewPicker || showSave || enableExport,
|
|
187
|
+
customActions || fieldActions || showFilterButton || showViewPicker || showSave || enableExport,
|
|
115
188
|
);
|
|
116
189
|
const hasTrailing = showActionCluster || isFetching;
|
|
117
190
|
|
|
@@ -124,7 +197,7 @@ function ToolbarLayout({
|
|
|
124
197
|
size={controlSize}
|
|
125
198
|
iconAfter={<CaretDownIcon size={iconPx} />}
|
|
126
199
|
aria-label={t("Saved views")}
|
|
127
|
-
{...(
|
|
200
|
+
{...(compact ? { minWidth: 0, maxWidth: "100%" as const } : {})}
|
|
128
201
|
aria-haspopup="menu"
|
|
129
202
|
>
|
|
130
203
|
{activeView?.name ?? t("Views")}
|
|
@@ -145,14 +218,32 @@ function ToolbarLayout({
|
|
|
145
218
|
</DropdownMenu.Content>
|
|
146
219
|
</DropdownMenu>
|
|
147
220
|
);
|
|
148
|
-
const
|
|
149
|
-
|
|
150
|
-
<
|
|
151
|
-
{
|
|
221
|
+
const saveViewForm = (onCancel: () => void) => (
|
|
222
|
+
<YStack {...knobProps.gap} minWidth={240} data-dismiss-class="compose">
|
|
223
|
+
<Input
|
|
224
|
+
placeholder={t("View name")}
|
|
225
|
+
value={newViewName}
|
|
226
|
+
onChangeText={setNewViewName}
|
|
227
|
+
size={searchSize}
|
|
228
|
+
inputProps={{
|
|
229
|
+
"aria-label": t("View name"),
|
|
230
|
+
onKeyDown: (e: React.KeyboardEvent) => {
|
|
231
|
+
if (e.key === "Enter") handleSaveView();
|
|
232
|
+
},
|
|
233
|
+
}}
|
|
234
|
+
/>
|
|
235
|
+
<XStack {...knobProps.gap} justifyContent="flex-end" alignItems="center">
|
|
236
|
+
<ActionButton kind="cancel" onPress={onCancel} />
|
|
237
|
+
<ActionButton
|
|
238
|
+
kind="save"
|
|
239
|
+
onPress={handleSaveView}
|
|
240
|
+
disabled={!newViewName.trim()}
|
|
241
|
+
disabledReason={t("Enter a view name")}
|
|
242
|
+
disabledReasonPlacement="inline"
|
|
243
|
+
/>
|
|
152
244
|
</XStack>
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
);
|
|
245
|
+
</YStack>
|
|
246
|
+
);
|
|
156
247
|
const saveView = showSave && (
|
|
157
248
|
<FloatingPanel
|
|
158
249
|
open={showSaveViewDialog}
|
|
@@ -170,45 +261,163 @@ function ToolbarLayout({
|
|
|
170
261
|
</RovingFocusGroup.Item>
|
|
171
262
|
}
|
|
172
263
|
>
|
|
173
|
-
|
|
174
|
-
<Input
|
|
175
|
-
placeholder={t("View name")}
|
|
176
|
-
value={newViewName}
|
|
177
|
-
onChangeText={setNewViewName}
|
|
178
|
-
size={searchSize}
|
|
179
|
-
inputProps={{
|
|
180
|
-
"aria-label": t("View name"),
|
|
181
|
-
onKeyDown: (e: React.KeyboardEvent) => {
|
|
182
|
-
if (e.key === "Enter") handleSaveView();
|
|
183
|
-
},
|
|
184
|
-
}}
|
|
185
|
-
/>
|
|
186
|
-
<XStack {...knobProps.gap} justifyContent="flex-end" alignItems="center">
|
|
187
|
-
<ActionButton kind="cancel" onPress={() => setShowSaveViewDialog(false)} />
|
|
188
|
-
<ActionButton
|
|
189
|
-
kind="save"
|
|
190
|
-
onPress={handleSaveView}
|
|
191
|
-
disabled={!newViewName.trim()}
|
|
192
|
-
disabledReason={t("Enter a view name")}
|
|
193
|
-
disabledReasonPlacement="inline"
|
|
194
|
-
/>
|
|
195
|
-
</XStack>
|
|
196
|
-
</YStack>
|
|
264
|
+
{saveViewForm(() => setShowSaveViewDialog(false))}
|
|
197
265
|
</FloatingPanel>
|
|
198
266
|
);
|
|
199
|
-
const
|
|
267
|
+
const renderSearch = (trailing?: React.ReactNode) => (
|
|
268
|
+
<SearchInput
|
|
269
|
+
value={globalFilter}
|
|
270
|
+
onChange={onGlobalFilterChange}
|
|
271
|
+
// Clear-X semantics follow filter ownership: when the toolbar
|
|
272
|
+
// owns a filter surface (enableFiltering) the X clears search
|
|
273
|
+
// AND filters (explicit clear intent). When the filter chrome
|
|
274
|
+
// is suppressed (enableFiltering=false — an outer surface owns
|
|
275
|
+
// filtering and injects tuples via initialState/state), the X
|
|
276
|
+
// must not mutate those injected filters; SearchInput already
|
|
277
|
+
// clears the text through onChange("").
|
|
278
|
+
onClear={enableFiltering ? onClearFilters : undefined}
|
|
279
|
+
placeholder={t("Search")}
|
|
280
|
+
aria-label={t("Search table data")}
|
|
281
|
+
size={searchSize}
|
|
282
|
+
trailing={trailing}
|
|
283
|
+
filled={compact}
|
|
284
|
+
/>
|
|
285
|
+
);
|
|
286
|
+
const search = enableGlobalSearch && renderSearch();
|
|
287
|
+
const fetching = isFetching && (
|
|
288
|
+
<XStack alignItems="center" aria-live="polite" data-table-fetching="true">
|
|
289
|
+
<Spinner size="small" />
|
|
290
|
+
</XStack>
|
|
291
|
+
);
|
|
292
|
+
|
|
293
|
+
if (compact) {
|
|
294
|
+
const showMoreMenu = showViewPicker || showSave || enableExport;
|
|
295
|
+
const pageSizes = pageSize
|
|
296
|
+
? [...new Set([...pageSize.options, pageSize.value].filter((n) => n > 0))].sort(
|
|
297
|
+
(a, b) => a - b,
|
|
298
|
+
)
|
|
299
|
+
: [];
|
|
300
|
+
const inField = enableGlobalSearch ? null : customActions;
|
|
301
|
+
const glyphs = (showFilterButton || fieldActions || inField || showMoreMenu) && (
|
|
302
|
+
<RovingFocusGroup orientation="horizontal" loop asChild>
|
|
303
|
+
<XStack
|
|
304
|
+
data-table-toolbar-actions=""
|
|
305
|
+
flexDirection="row"
|
|
306
|
+
alignItems="center"
|
|
307
|
+
flexShrink={0}
|
|
308
|
+
gap={0}
|
|
309
|
+
>
|
|
310
|
+
{showFilterButton && <DataTableFilterGlyph />}
|
|
311
|
+
{fieldActions}
|
|
312
|
+
{inField}
|
|
313
|
+
{pageSize && !showMoreMenu && (
|
|
314
|
+
<DataTableViewMenu
|
|
315
|
+
pageSize={pageSize.value}
|
|
316
|
+
pageSizeOptions={pageSize.options}
|
|
317
|
+
onPageSizeChange={pageSize.onChange}
|
|
318
|
+
disabled={pageSize.disabled}
|
|
319
|
+
/>
|
|
320
|
+
)}
|
|
321
|
+
{showMoreMenu && (
|
|
322
|
+
<FloatingPanel
|
|
323
|
+
open={showMore}
|
|
324
|
+
onOpenChange={setShowMore}
|
|
325
|
+
triggerSizing="content"
|
|
326
|
+
widthMode="fit-content"
|
|
327
|
+
trigger={
|
|
328
|
+
<RovingFocusGroup.Item focusable asChild>
|
|
329
|
+
<MoreGlyph size={controlSize} iconPx={iconPx} label={t("More table actions")} />
|
|
330
|
+
</RovingFocusGroup.Item>
|
|
331
|
+
}
|
|
332
|
+
>
|
|
333
|
+
<YStack {...knobProps.gap} data-table-toolbar-more="">
|
|
334
|
+
{enableExport && <DataTableExport />}
|
|
335
|
+
{viewPickerContent}
|
|
336
|
+
{showSave && saveViewForm(() => setShowMore(false))}
|
|
337
|
+
{pageSize && (
|
|
338
|
+
<ToggleGroup
|
|
339
|
+
label={t("Rows per page")}
|
|
340
|
+
type="single"
|
|
341
|
+
size={controlSize as never}
|
|
342
|
+
value={String(pageSize.value)}
|
|
343
|
+
disabled={pageSize.disabled}
|
|
344
|
+
options={pageSizes.map((n) => ({ value: String(n), label: String(n) }))}
|
|
345
|
+
onValueChange={(next) => {
|
|
346
|
+
const n = Number(Array.isArray(next) ? next[0] : next);
|
|
347
|
+
if (n > 0) pageSize.onChange(n);
|
|
348
|
+
}}
|
|
349
|
+
/>
|
|
350
|
+
)}
|
|
351
|
+
</YStack>
|
|
352
|
+
</FloatingPanel>
|
|
353
|
+
)}
|
|
354
|
+
</XStack>
|
|
355
|
+
</RovingFocusGroup>
|
|
356
|
+
);
|
|
357
|
+
const accessories = (fetching || glyphs) && (
|
|
358
|
+
<ToolbarGlyphFieldHeight.Provider value={fieldHeight}>
|
|
359
|
+
{fetching}
|
|
360
|
+
{glyphs}
|
|
361
|
+
</ToolbarGlyphFieldHeight.Provider>
|
|
362
|
+
);
|
|
363
|
+
// HIG `.searchable`: one field over the list, its accessories inside it.
|
|
364
|
+
return (
|
|
365
|
+
<Surface bar>
|
|
366
|
+
<XStack
|
|
367
|
+
data-table-toolbar-row=""
|
|
368
|
+
flexDirection="row"
|
|
369
|
+
alignItems="center"
|
|
370
|
+
flexWrap="nowrap"
|
|
371
|
+
width="100%"
|
|
372
|
+
minWidth={0}
|
|
373
|
+
{...(cardLayout
|
|
374
|
+
? { paddingVertical: enableGlobalSearch ? knobProps.gap.gap : 0 }
|
|
375
|
+
: {
|
|
376
|
+
paddingVertical: knobProps.panelPadding.padding,
|
|
377
|
+
...(divider ? { ...hairline.bottom, borderColor: "$borderColor" } : null),
|
|
378
|
+
})}
|
|
379
|
+
paddingHorizontal={0}
|
|
380
|
+
{...knobProps.gap}
|
|
381
|
+
role="toolbar"
|
|
382
|
+
aria-label={t("Table toolbar")}
|
|
383
|
+
aria-busy={isFetching || undefined}
|
|
384
|
+
>
|
|
385
|
+
{enableGlobalSearch ? (
|
|
386
|
+
<>
|
|
387
|
+
<YStack data-table-toolbar-search="" flex={1} minWidth={0}>
|
|
388
|
+
{renderSearch(accessories || undefined)}
|
|
389
|
+
</YStack>
|
|
390
|
+
{customActions ? (
|
|
391
|
+
<XStack
|
|
392
|
+
data-table-toolbar-custom=""
|
|
393
|
+
flexShrink={0}
|
|
394
|
+
alignItems="center"
|
|
395
|
+
{...knobProps.gap}
|
|
396
|
+
>
|
|
397
|
+
{customActions}
|
|
398
|
+
</XStack>
|
|
399
|
+
) : null}
|
|
400
|
+
</>
|
|
401
|
+
) : (
|
|
402
|
+
<XStack data-table-toolbar-trailing="" flex={1} minWidth={0} justifyContent="flex-end">
|
|
403
|
+
{fetching}
|
|
404
|
+
{glyphs}
|
|
405
|
+
</XStack>
|
|
406
|
+
)}
|
|
407
|
+
</XStack>
|
|
408
|
+
</Surface>
|
|
409
|
+
);
|
|
410
|
+
}
|
|
200
411
|
|
|
201
412
|
return (
|
|
202
413
|
<XStack
|
|
203
|
-
alignItems=
|
|
204
|
-
flexDirection=
|
|
205
|
-
{...(cardLayout ? { width: "100%" as const, minWidth: 0 } : {})}
|
|
414
|
+
alignItems="center"
|
|
415
|
+
flexDirection="row"
|
|
206
416
|
// LC-39: flush band — no painted panel, so no horizontal inset.
|
|
207
417
|
paddingVertical={knobProps.panelPadding.padding}
|
|
208
418
|
paddingHorizontal={0}
|
|
209
419
|
{...knobProps.gap}
|
|
210
|
-
{...hairline.bottom}
|
|
211
|
-
borderColor="$borderColor"
|
|
420
|
+
{...(divider ? { ...hairline.bottom, borderColor: "$borderColor" } : null)}
|
|
212
421
|
flexWrap="nowrap"
|
|
213
422
|
justifyContent={enableGlobalSearch && hasTrailing ? "space-between" : "flex-start"}
|
|
214
423
|
role="toolbar"
|
|
@@ -216,102 +425,31 @@ function ToolbarLayout({
|
|
|
216
425
|
aria-busy={isFetching || undefined}
|
|
217
426
|
>
|
|
218
427
|
{enableGlobalSearch && (
|
|
219
|
-
<
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
maxWidth={cardLayout ? undefined : searchMaxWidth}
|
|
223
|
-
flexShrink={1}
|
|
224
|
-
>
|
|
225
|
-
<SearchInput
|
|
226
|
-
value={globalFilter}
|
|
227
|
-
onChange={onGlobalFilterChange}
|
|
228
|
-
// Clear-X semantics follow filter ownership: when the toolbar
|
|
229
|
-
// owns a filter surface (enableFiltering) the X clears search
|
|
230
|
-
// AND filters (explicit clear intent). When the filter chrome
|
|
231
|
-
// is suppressed (enableFiltering=false — an outer surface owns
|
|
232
|
-
// filtering and injects tuples via initialState/state), the X
|
|
233
|
-
// must not mutate those injected filters; SearchInput already
|
|
234
|
-
// clears the text through onChange("").
|
|
235
|
-
onClear={enableFiltering ? onClearFilters : undefined}
|
|
236
|
-
placeholder={t("Search")}
|
|
237
|
-
aria-label={t("Search table data")}
|
|
238
|
-
size={searchSize}
|
|
239
|
-
/>
|
|
240
|
-
</XStack>
|
|
428
|
+
<YStack flex={1} minWidth={160} maxWidth={searchMaxWidth} flexShrink={1}>
|
|
429
|
+
{search}
|
|
430
|
+
</YStack>
|
|
241
431
|
)}
|
|
242
432
|
|
|
243
|
-
{
|
|
244
|
-
|
|
245
|
-
{
|
|
433
|
+
{hasTrailing && (
|
|
434
|
+
<XStack alignItems="center" {...knobProps.gap} flexShrink={0}>
|
|
435
|
+
{showActionCluster && (
|
|
246
436
|
<RovingFocusGroup orientation="horizontal" loop asChild>
|
|
247
|
-
<XStack
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
{...knobProps.gap}
|
|
254
|
-
>
|
|
255
|
-
{showFilterButton && (
|
|
256
|
-
<XStack flexShrink={0}>
|
|
257
|
-
<DataTableCardFilterButton />
|
|
258
|
-
</XStack>
|
|
259
|
-
)}
|
|
437
|
+
<XStack alignItems="center" {...knobProps.gap}>
|
|
438
|
+
{showFilterButton && <DataTableFilterButton />}
|
|
439
|
+
|
|
440
|
+
{enableExport && <DataTableExport />}
|
|
441
|
+
|
|
442
|
+
{fieldActions}
|
|
260
443
|
{customActions}
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
)}
|
|
264
|
-
{showSecondary && (
|
|
265
|
-
<RovingFocusGroup orientation="horizontal" loop asChild>
|
|
266
|
-
<XStack
|
|
267
|
-
data-table-card-secondary=""
|
|
268
|
-
width="100%"
|
|
269
|
-
minWidth={0}
|
|
270
|
-
flexWrap="wrap"
|
|
271
|
-
alignItems="center"
|
|
272
|
-
{...knobProps.gap}
|
|
273
|
-
>
|
|
274
|
-
{enableExport && (
|
|
275
|
-
<XStack maxWidth="100%" minWidth={0}>
|
|
276
|
-
<DataTableExport />
|
|
277
|
-
</XStack>
|
|
278
|
-
)}
|
|
279
|
-
{viewPicker}
|
|
444
|
+
|
|
445
|
+
{viewPickerContent}
|
|
280
446
|
{saveView}
|
|
281
|
-
{isFetching && (
|
|
282
|
-
<XStack alignItems="center" aria-live="polite" data-table-fetching="true">
|
|
283
|
-
<Spinner size="small" />
|
|
284
|
-
</XStack>
|
|
285
|
-
)}
|
|
286
447
|
</XStack>
|
|
287
448
|
</RovingFocusGroup>
|
|
288
449
|
)}
|
|
289
|
-
</>
|
|
290
|
-
) : (
|
|
291
|
-
hasTrailing && (
|
|
292
|
-
<XStack alignItems="center" {...knobProps.gap} flexShrink={0}>
|
|
293
|
-
{showActionCluster && (
|
|
294
|
-
<RovingFocusGroup orientation="horizontal" loop asChild>
|
|
295
|
-
<XStack alignItems="center" {...knobProps.gap}>
|
|
296
|
-
{showFilterButton && <DataTableFilterButton />}
|
|
297
|
-
|
|
298
|
-
{enableExport && <DataTableExport />}
|
|
299
450
|
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
{viewPicker}
|
|
303
|
-
{saveView}
|
|
304
|
-
</XStack>
|
|
305
|
-
</RovingFocusGroup>
|
|
306
|
-
)}
|
|
307
|
-
|
|
308
|
-
{isFetching && (
|
|
309
|
-
<XStack alignItems="center" aria-live="polite" data-table-fetching="true">
|
|
310
|
-
<Spinner size="small" />
|
|
311
|
-
</XStack>
|
|
312
|
-
)}
|
|
313
|
-
</XStack>
|
|
314
|
-
)
|
|
451
|
+
{fetching}
|
|
452
|
+
</XStack>
|
|
315
453
|
)}
|
|
316
454
|
</XStack>
|
|
317
455
|
);
|
|
@@ -50,7 +50,7 @@ describe("Table Accessibility", () => {
|
|
|
50
50
|
const filterTrigger = filterContainer.querySelector('[aria-label="Filter column Name"]');
|
|
51
51
|
expect(filterTrigger).not.toBeNull();
|
|
52
52
|
|
|
53
|
-
// Render toolbar with view management (
|
|
53
|
+
// Render toolbar with view management (icon-only buttons)
|
|
54
54
|
const { container: viewsContainer } = renderWithProviders(
|
|
55
55
|
<DataTableToolbar
|
|
56
56
|
enableViews
|
|
@@ -61,8 +61,9 @@ describe("Table Accessibility", () => {
|
|
|
61
61
|
/>,
|
|
62
62
|
);
|
|
63
63
|
|
|
64
|
-
|
|
65
|
-
|
|
64
|
+
// FZ-8039: on a phone the view actions ride the "…" glyph.
|
|
65
|
+
const moreButton = viewsContainer.querySelector('[aria-label="More table actions"]');
|
|
66
|
+
expect(moreButton).not.toBeNull();
|
|
66
67
|
});
|
|
67
68
|
|
|
68
69
|
it("useTableKeyboard handles ArrowDown, ArrowUp, Home, End, PageDown, PageUp", () => {
|