@marigold/components 4.2.0 → 4.2.1
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/index.js +30 -28
- package/dist/index.mjs +19 -17
- package/package.json +3 -3
package/dist/index.js
CHANGED
|
@@ -1329,6 +1329,7 @@ var MenuItem = ({ item, state, onAction, css }) => {
|
|
|
1329
1329
|
const stateProps = (0, import_system25.useStateProps)({
|
|
1330
1330
|
focus: isFocusVisible
|
|
1331
1331
|
});
|
|
1332
|
+
const { onPointerUp, ...props } = menuItemProps;
|
|
1332
1333
|
return /* @__PURE__ */ import_react38.default.createElement(import_system25.Box, {
|
|
1333
1334
|
as: "li",
|
|
1334
1335
|
ref,
|
|
@@ -1338,7 +1339,7 @@ var MenuItem = ({ item, state, onAction, css }) => {
|
|
|
1338
1339
|
}
|
|
1339
1340
|
},
|
|
1340
1341
|
css,
|
|
1341
|
-
...(0, import_utils8.mergeProps)(
|
|
1342
|
+
...(0, import_utils8.mergeProps)(props, { onPointerDown: onPointerUp }, focusProps),
|
|
1342
1343
|
...stateProps
|
|
1343
1344
|
}, item.rendered);
|
|
1344
1345
|
};
|
|
@@ -1790,12 +1791,12 @@ var import_i18n2 = require("@react-aria/i18n");
|
|
|
1790
1791
|
var import_select = require("@react-aria/select");
|
|
1791
1792
|
var import_select2 = require("@react-stately/select");
|
|
1792
1793
|
var import_collections2 = require("@react-stately/collections");
|
|
1793
|
-
var
|
|
1794
|
+
var import_utils15 = require("@react-aria/utils");
|
|
1794
1795
|
var import_system37 = require("@marigold/system");
|
|
1795
1796
|
|
|
1796
1797
|
// src/ListBox/ListBox.tsx
|
|
1797
1798
|
var import_react50 = __toESM(require("react"));
|
|
1798
|
-
var
|
|
1799
|
+
var import_utils14 = require("@react-aria/utils");
|
|
1799
1800
|
var import_system36 = require("@marigold/system");
|
|
1800
1801
|
var import_listbox3 = require("@react-aria/listbox");
|
|
1801
1802
|
|
|
@@ -1812,6 +1813,7 @@ var import_system35 = require("@marigold/system");
|
|
|
1812
1813
|
// src/ListBox/ListBoxOption.tsx
|
|
1813
1814
|
var import_react48 = __toESM(require("react"));
|
|
1814
1815
|
var import_listbox = require("@react-aria/listbox");
|
|
1816
|
+
var import_utils13 = require("@react-aria/utils");
|
|
1815
1817
|
var import_system34 = require("@marigold/system");
|
|
1816
1818
|
var ListBoxOption = ({ item, state }) => {
|
|
1817
1819
|
const ref = (0, import_react48.useRef)(null);
|
|
@@ -1822,6 +1824,7 @@ var ListBoxOption = ({ item, state }) => {
|
|
|
1822
1824
|
state,
|
|
1823
1825
|
ref
|
|
1824
1826
|
);
|
|
1827
|
+
const { onPointerUp, ...props } = optionProps;
|
|
1825
1828
|
const { styles } = useListBoxContext();
|
|
1826
1829
|
const stateProps = (0, import_system34.useStateProps)({
|
|
1827
1830
|
selected: isSelected,
|
|
@@ -1832,8 +1835,7 @@ var ListBoxOption = ({ item, state }) => {
|
|
|
1832
1835
|
as: "li",
|
|
1833
1836
|
ref,
|
|
1834
1837
|
css: styles.option,
|
|
1835
|
-
...
|
|
1836
|
-
...stateProps
|
|
1838
|
+
...(0, import_utils13.mergeProps)(props, { onPointerDown: onPointerUp }, { ...stateProps })
|
|
1837
1839
|
}, item.rendered);
|
|
1838
1840
|
};
|
|
1839
1841
|
|
|
@@ -1866,7 +1868,7 @@ var ListBoxSection = ({ section, state }) => {
|
|
|
1866
1868
|
// src/ListBox/ListBox.tsx
|
|
1867
1869
|
var ListBox = (0, import_react50.forwardRef)(
|
|
1868
1870
|
({ state, variant, size, ...props }, ref) => {
|
|
1869
|
-
const innerRef = (0,
|
|
1871
|
+
const innerRef = (0, import_utils14.useObjectRef)(ref);
|
|
1870
1872
|
const { listBoxProps } = (0, import_listbox3.useListBox)(props, state, innerRef);
|
|
1871
1873
|
const styles = (0, import_system36.useComponentStyles)(
|
|
1872
1874
|
"ListBox",
|
|
@@ -1932,7 +1934,7 @@ var Select = (0, import_react51.forwardRef)(
|
|
|
1932
1934
|
...rest
|
|
1933
1935
|
};
|
|
1934
1936
|
const state = (0, import_select2.useSelectState)(props);
|
|
1935
|
-
const buttonRef = (0,
|
|
1937
|
+
const buttonRef = (0, import_utils15.useObjectRef)(ref);
|
|
1936
1938
|
const listboxRef = (0, import_react51.useRef)(null);
|
|
1937
1939
|
const isSmallScreen = (0, import_system37.useResponsiveValue)([true, false, false], 2);
|
|
1938
1940
|
const {
|
|
@@ -1990,7 +1992,7 @@ var Select = (0, import_react51.forwardRef)(
|
|
|
1990
1992
|
},
|
|
1991
1993
|
css: styles.button,
|
|
1992
1994
|
ref: buttonRef,
|
|
1993
|
-
...(0,
|
|
1995
|
+
...(0, import_utils15.mergeProps)(buttonProps, focusProps),
|
|
1994
1996
|
...stateProps
|
|
1995
1997
|
}, /* @__PURE__ */ import_react51.default.createElement(import_system37.Box, {
|
|
1996
1998
|
css: {
|
|
@@ -2029,13 +2031,13 @@ var import_react53 = __toESM(require("react"));
|
|
|
2029
2031
|
var import_slider2 = require("@react-aria/slider");
|
|
2030
2032
|
var import_slider3 = require("@react-stately/slider");
|
|
2031
2033
|
var import_i18n3 = require("@react-aria/i18n");
|
|
2032
|
-
var
|
|
2034
|
+
var import_utils17 = require("@react-aria/utils");
|
|
2033
2035
|
var import_system39 = require("@marigold/system");
|
|
2034
2036
|
|
|
2035
2037
|
// src/Slider/Thumb.tsx
|
|
2036
2038
|
var import_react52 = __toESM(require("react"));
|
|
2037
2039
|
var import_slider = require("@react-aria/slider");
|
|
2038
|
-
var
|
|
2040
|
+
var import_utils16 = require("@react-aria/utils");
|
|
2039
2041
|
var import_system38 = require("@marigold/system");
|
|
2040
2042
|
|
|
2041
2043
|
// src/VisuallyHidden/VisuallyHidden.tsx
|
|
@@ -2073,7 +2075,7 @@ var Thumb = ({ state, trackRef, styles, ...props }) => {
|
|
|
2073
2075
|
as: "input",
|
|
2074
2076
|
type: "range",
|
|
2075
2077
|
ref: inputRef,
|
|
2076
|
-
...(0,
|
|
2078
|
+
...(0, import_utils16.mergeProps)(inputProps, focusProps)
|
|
2077
2079
|
})));
|
|
2078
2080
|
};
|
|
2079
2081
|
|
|
@@ -2081,7 +2083,7 @@ var Thumb = ({ state, trackRef, styles, ...props }) => {
|
|
|
2081
2083
|
var Slider = (0, import_react53.forwardRef)(
|
|
2082
2084
|
({ variant, size, width = "100%", ...props }, ref) => {
|
|
2083
2085
|
const { formatOptions } = props;
|
|
2084
|
-
const trackRef = (0,
|
|
2086
|
+
const trackRef = (0, import_utils17.useObjectRef)(ref);
|
|
2085
2087
|
const numberFormatter = (0, import_i18n3.useNumberFormatter)(formatOptions);
|
|
2086
2088
|
const state = (0, import_slider3.useSliderState)({ ...props, numberFormatter });
|
|
2087
2089
|
const { groupProps, trackProps, labelProps, outputProps } = (0, import_slider2.useSlider)(
|
|
@@ -2186,7 +2188,7 @@ var Stack = ({
|
|
|
2186
2188
|
var import_react56 = __toESM(require("react"));
|
|
2187
2189
|
var import_focus11 = require("@react-aria/focus");
|
|
2188
2190
|
var import_switch = require("@react-aria/switch");
|
|
2189
|
-
var
|
|
2191
|
+
var import_utils18 = require("@react-aria/utils");
|
|
2190
2192
|
var import_toggle2 = require("@react-stately/toggle");
|
|
2191
2193
|
var import_system41 = require("@marigold/system");
|
|
2192
2194
|
var Switch = (0, import_react56.forwardRef)(
|
|
@@ -2200,7 +2202,7 @@ var Switch = (0, import_react56.forwardRef)(
|
|
|
2200
2202
|
defaultChecked,
|
|
2201
2203
|
...rest
|
|
2202
2204
|
}, ref) => {
|
|
2203
|
-
const inputRef = (0,
|
|
2205
|
+
const inputRef = (0, import_utils18.useObjectRef)(ref);
|
|
2204
2206
|
const props = {
|
|
2205
2207
|
isSelected: checked,
|
|
2206
2208
|
isDisabled: disabled,
|
|
@@ -2309,7 +2311,7 @@ var TableBody = ({ children }) => {
|
|
|
2309
2311
|
var import_react59 = __toESM(require("react"));
|
|
2310
2312
|
var import_table2 = require("@react-aria/table");
|
|
2311
2313
|
var import_focus12 = require("@react-aria/focus");
|
|
2312
|
-
var
|
|
2314
|
+
var import_utils19 = require("@react-aria/utils");
|
|
2313
2315
|
var import_system42 = require("@marigold/system");
|
|
2314
2316
|
var TableCell = ({ cell }) => {
|
|
2315
2317
|
const ref = (0, import_react59.useRef)(null);
|
|
@@ -2333,7 +2335,7 @@ var TableCell = ({ cell }) => {
|
|
|
2333
2335
|
as: "td",
|
|
2334
2336
|
ref,
|
|
2335
2337
|
css: styles.cell,
|
|
2336
|
-
...(0,
|
|
2338
|
+
...(0, import_utils19.mergeProps)(cellProps, focusProps),
|
|
2337
2339
|
...stateProps
|
|
2338
2340
|
}, cell.rendered);
|
|
2339
2341
|
};
|
|
@@ -2342,7 +2344,7 @@ var TableCell = ({ cell }) => {
|
|
|
2342
2344
|
var import_react60 = __toESM(require("react"));
|
|
2343
2345
|
var import_table3 = require("@react-aria/table");
|
|
2344
2346
|
var import_focus13 = require("@react-aria/focus");
|
|
2345
|
-
var
|
|
2347
|
+
var import_utils20 = require("@react-aria/utils");
|
|
2346
2348
|
var import_system43 = require("@marigold/system");
|
|
2347
2349
|
|
|
2348
2350
|
// src/Table/utils.ts
|
|
@@ -2391,7 +2393,7 @@ var TableCheckboxCell = ({ cell }) => {
|
|
|
2391
2393
|
lineHeight: 1
|
|
2392
2394
|
},
|
|
2393
2395
|
css: styles.cell,
|
|
2394
|
-
...(0,
|
|
2396
|
+
...(0, import_utils20.mergeProps)(gridCellProps, focusProps),
|
|
2395
2397
|
...stateProps
|
|
2396
2398
|
}, /* @__PURE__ */ import_react60.default.createElement(Checkbox, {
|
|
2397
2399
|
...checkboxProps
|
|
@@ -2403,7 +2405,7 @@ var import_react61 = __toESM(require("react"));
|
|
|
2403
2405
|
var import_focus14 = require("@react-aria/focus");
|
|
2404
2406
|
var import_interactions8 = require("@react-aria/interactions");
|
|
2405
2407
|
var import_table4 = require("@react-aria/table");
|
|
2406
|
-
var
|
|
2408
|
+
var import_utils22 = require("@react-aria/utils");
|
|
2407
2409
|
var import_system44 = require("@marigold/system");
|
|
2408
2410
|
var SortIndicator = ({
|
|
2409
2411
|
direction = "ascending",
|
|
@@ -2441,7 +2443,7 @@ var TableColumnHeader = ({ column }) => {
|
|
|
2441
2443
|
ref,
|
|
2442
2444
|
__baseCSS: { cursor: "default" },
|
|
2443
2445
|
css: styles.header,
|
|
2444
|
-
...(0,
|
|
2446
|
+
...(0, import_utils22.mergeProps)(columnHeaderProps, hoverProps, focusProps),
|
|
2445
2447
|
...stateProps
|
|
2446
2448
|
}, column.rendered, column.props.allowsSorting && /* @__PURE__ */ import_react61.default.createElement(SortIndicator, {
|
|
2447
2449
|
direction: (_a = state.sortDescriptor) == null ? void 0 : _a.direction,
|
|
@@ -2477,7 +2479,7 @@ var import_react64 = __toESM(require("react"));
|
|
|
2477
2479
|
var import_focus15 = require("@react-aria/focus");
|
|
2478
2480
|
var import_interactions9 = require("@react-aria/interactions");
|
|
2479
2481
|
var import_table7 = require("@react-aria/table");
|
|
2480
|
-
var
|
|
2482
|
+
var import_utils23 = require("@react-aria/utils");
|
|
2481
2483
|
var import_system45 = require("@marigold/system");
|
|
2482
2484
|
var TableRow = ({ children, row }) => {
|
|
2483
2485
|
const ref = (0, import_react64.useRef)(null);
|
|
@@ -2515,7 +2517,7 @@ var TableRow = ({ children, row }) => {
|
|
|
2515
2517
|
cursor: !interactive ? "text" : disabled ? "default" : "pointer"
|
|
2516
2518
|
},
|
|
2517
2519
|
css: styles,
|
|
2518
|
-
...(0,
|
|
2520
|
+
...(0, import_utils23.mergeProps)(rowProps, focusProps, hoverProps),
|
|
2519
2521
|
...stateProps
|
|
2520
2522
|
}, children);
|
|
2521
2523
|
};
|
|
@@ -2525,7 +2527,7 @@ var import_react65 = __toESM(require("react"));
|
|
|
2525
2527
|
var import_focus16 = require("@react-aria/focus");
|
|
2526
2528
|
var import_interactions10 = require("@react-aria/interactions");
|
|
2527
2529
|
var import_table8 = require("@react-aria/table");
|
|
2528
|
-
var
|
|
2530
|
+
var import_utils24 = require("@react-aria/utils");
|
|
2529
2531
|
var import_system46 = require("@marigold/system");
|
|
2530
2532
|
var TableSelectAllCell = ({ column }) => {
|
|
2531
2533
|
const ref = (0, import_react65.useRef)(null);
|
|
@@ -2553,7 +2555,7 @@ var TableSelectAllCell = ({ column }) => {
|
|
|
2553
2555
|
lineHeight: 1
|
|
2554
2556
|
},
|
|
2555
2557
|
css: styles.header,
|
|
2556
|
-
...(0,
|
|
2558
|
+
...(0, import_utils24.mergeProps)(columnHeaderProps, hoverProps, focusProps),
|
|
2557
2559
|
...stateProps
|
|
2558
2560
|
}, /* @__PURE__ */ import_react65.default.createElement(Checkbox, {
|
|
2559
2561
|
...checkboxProps
|
|
@@ -2667,7 +2669,7 @@ var import_react68 = __toESM(require("react"));
|
|
|
2667
2669
|
var import_interactions11 = require("@react-aria/interactions");
|
|
2668
2670
|
var import_focus17 = require("@react-aria/focus");
|
|
2669
2671
|
var import_textfield = require("@react-aria/textfield");
|
|
2670
|
-
var
|
|
2672
|
+
var import_utils26 = require("@react-aria/utils");
|
|
2671
2673
|
var import_system50 = require("@marigold/system");
|
|
2672
2674
|
var TextArea = (0, import_react68.forwardRef)(
|
|
2673
2675
|
({
|
|
@@ -2682,7 +2684,7 @@ var TextArea = (0, import_react68.forwardRef)(
|
|
|
2682
2684
|
...props
|
|
2683
2685
|
}, ref) => {
|
|
2684
2686
|
const { label, description, errorMessage } = props;
|
|
2685
|
-
const textAreaRef = (0,
|
|
2687
|
+
const textAreaRef = (0, import_utils26.useObjectRef)(ref);
|
|
2686
2688
|
const { labelProps, inputProps, descriptionProps, errorMessageProps } = (0, import_textfield.useTextField)(
|
|
2687
2689
|
{
|
|
2688
2690
|
inputElementType: "textarea",
|
|
@@ -2735,12 +2737,12 @@ var import_react69 = __toESM(require("react"));
|
|
|
2735
2737
|
var import_interactions12 = require("@react-aria/interactions");
|
|
2736
2738
|
var import_focus18 = require("@react-aria/focus");
|
|
2737
2739
|
var import_textfield2 = require("@react-aria/textfield");
|
|
2738
|
-
var
|
|
2740
|
+
var import_utils27 = require("@react-aria/utils");
|
|
2739
2741
|
var import_system51 = require("@marigold/system");
|
|
2740
2742
|
var TextField = (0, import_react69.forwardRef)(
|
|
2741
2743
|
({ variant, size, width, disabled, required, readOnly, error, ...props }, ref) => {
|
|
2742
2744
|
const { label, description, errorMessage, autoFocus } = props;
|
|
2743
|
-
const inputRef = (0,
|
|
2745
|
+
const inputRef = (0, import_utils27.useObjectRef)(ref);
|
|
2744
2746
|
const { labelProps, inputProps, descriptionProps, errorMessageProps } = (0, import_textfield2.useTextField)(
|
|
2745
2747
|
{
|
|
2746
2748
|
isDisabled: disabled,
|
package/dist/index.mjs
CHANGED
|
@@ -1296,6 +1296,7 @@ var MenuItem = ({ item, state, onAction, css }) => {
|
|
|
1296
1296
|
const stateProps = useStateProps4({
|
|
1297
1297
|
focus: isFocusVisible
|
|
1298
1298
|
});
|
|
1299
|
+
const { onPointerUp, ...props } = menuItemProps;
|
|
1299
1300
|
return /* @__PURE__ */ React34.createElement(Box19, {
|
|
1300
1301
|
as: "li",
|
|
1301
1302
|
ref,
|
|
@@ -1305,7 +1306,7 @@ var MenuItem = ({ item, state, onAction, css }) => {
|
|
|
1305
1306
|
}
|
|
1306
1307
|
},
|
|
1307
1308
|
css,
|
|
1308
|
-
...mergeProps3(
|
|
1309
|
+
...mergeProps3(props, { onPointerDown: onPointerUp }, focusProps),
|
|
1309
1310
|
...stateProps
|
|
1310
1311
|
}, item.rendered);
|
|
1311
1312
|
};
|
|
@@ -1775,7 +1776,7 @@ import { useLocalizedStringFormatter } from "@react-aria/i18n";
|
|
|
1775
1776
|
import { HiddenSelect, useSelect } from "@react-aria/select";
|
|
1776
1777
|
import { useSelectState } from "@react-stately/select";
|
|
1777
1778
|
import { Item as Item2, Section } from "@react-stately/collections";
|
|
1778
|
-
import { mergeProps as
|
|
1779
|
+
import { mergeProps as mergeProps8, useObjectRef as useObjectRef11 } from "@react-aria/utils";
|
|
1779
1780
|
import {
|
|
1780
1781
|
Box as Box28,
|
|
1781
1782
|
useComponentStyles as useComponentStyles24,
|
|
@@ -1805,6 +1806,7 @@ import { Box as Box26 } from "@marigold/system";
|
|
|
1805
1806
|
// src/ListBox/ListBoxOption.tsx
|
|
1806
1807
|
import React42, { useRef as useRef8 } from "react";
|
|
1807
1808
|
import { useOption } from "@react-aria/listbox";
|
|
1809
|
+
import { mergeProps as mergeProps7 } from "@react-aria/utils";
|
|
1808
1810
|
import { Box as Box25, useStateProps as useStateProps9 } from "@marigold/system";
|
|
1809
1811
|
var ListBoxOption = ({ item, state }) => {
|
|
1810
1812
|
const ref = useRef8(null);
|
|
@@ -1815,6 +1817,7 @@ var ListBoxOption = ({ item, state }) => {
|
|
|
1815
1817
|
state,
|
|
1816
1818
|
ref
|
|
1817
1819
|
);
|
|
1820
|
+
const { onPointerUp, ...props } = optionProps;
|
|
1818
1821
|
const { styles } = useListBoxContext();
|
|
1819
1822
|
const stateProps = useStateProps9({
|
|
1820
1823
|
selected: isSelected,
|
|
@@ -1825,8 +1828,7 @@ var ListBoxOption = ({ item, state }) => {
|
|
|
1825
1828
|
as: "li",
|
|
1826
1829
|
ref,
|
|
1827
1830
|
css: styles.option,
|
|
1828
|
-
...
|
|
1829
|
-
...stateProps
|
|
1831
|
+
...mergeProps7(props, { onPointerDown: onPointerUp }, { ...stateProps })
|
|
1830
1832
|
}, item.rendered);
|
|
1831
1833
|
};
|
|
1832
1834
|
|
|
@@ -1983,7 +1985,7 @@ var Select = forwardRef11(
|
|
|
1983
1985
|
},
|
|
1984
1986
|
css: styles.button,
|
|
1985
1987
|
ref: buttonRef,
|
|
1986
|
-
...
|
|
1988
|
+
...mergeProps8(buttonProps, focusProps),
|
|
1987
1989
|
...stateProps
|
|
1988
1990
|
}, /* @__PURE__ */ React45.createElement(Box28, {
|
|
1989
1991
|
css: {
|
|
@@ -2028,7 +2030,7 @@ import { useComponentStyles as useComponentStyles25 } from "@marigold/system";
|
|
|
2028
2030
|
// src/Slider/Thumb.tsx
|
|
2029
2031
|
import React46, { useEffect } from "react";
|
|
2030
2032
|
import { useSliderThumb } from "@react-aria/slider";
|
|
2031
|
-
import { mergeProps as
|
|
2033
|
+
import { mergeProps as mergeProps9 } from "@react-aria/utils";
|
|
2032
2034
|
import { useStateProps as useStateProps11 } from "@marigold/system";
|
|
2033
2035
|
|
|
2034
2036
|
// src/VisuallyHidden/VisuallyHidden.tsx
|
|
@@ -2066,7 +2068,7 @@ var Thumb = ({ state, trackRef, styles, ...props }) => {
|
|
|
2066
2068
|
as: "input",
|
|
2067
2069
|
type: "range",
|
|
2068
2070
|
ref: inputRef,
|
|
2069
|
-
...
|
|
2071
|
+
...mergeProps9(inputProps, focusProps)
|
|
2070
2072
|
})));
|
|
2071
2073
|
};
|
|
2072
2074
|
|
|
@@ -2315,7 +2317,7 @@ var TableBody = ({ children }) => {
|
|
|
2315
2317
|
import React52, { useRef as useRef10 } from "react";
|
|
2316
2318
|
import { useTableCell } from "@react-aria/table";
|
|
2317
2319
|
import { useFocusRing as useFocusRing9 } from "@react-aria/focus";
|
|
2318
|
-
import { mergeProps as
|
|
2320
|
+
import { mergeProps as mergeProps10 } from "@react-aria/utils";
|
|
2319
2321
|
import { Box as Box30, useStateProps as useStateProps13 } from "@marigold/system";
|
|
2320
2322
|
var TableCell = ({ cell }) => {
|
|
2321
2323
|
const ref = useRef10(null);
|
|
@@ -2339,7 +2341,7 @@ var TableCell = ({ cell }) => {
|
|
|
2339
2341
|
as: "td",
|
|
2340
2342
|
ref,
|
|
2341
2343
|
css: styles.cell,
|
|
2342
|
-
...
|
|
2344
|
+
...mergeProps10(cellProps, focusProps),
|
|
2343
2345
|
...stateProps
|
|
2344
2346
|
}, cell.rendered);
|
|
2345
2347
|
};
|
|
@@ -2348,7 +2350,7 @@ var TableCell = ({ cell }) => {
|
|
|
2348
2350
|
import React53, { useRef as useRef11 } from "react";
|
|
2349
2351
|
import { useTableCell as useTableCell2, useTableSelectionCheckbox } from "@react-aria/table";
|
|
2350
2352
|
import { useFocusRing as useFocusRing10 } from "@react-aria/focus";
|
|
2351
|
-
import { mergeProps as
|
|
2353
|
+
import { mergeProps as mergeProps11 } from "@react-aria/utils";
|
|
2352
2354
|
import { Box as Box31, useStateProps as useStateProps14 } from "@marigold/system";
|
|
2353
2355
|
|
|
2354
2356
|
// src/Table/utils.ts
|
|
@@ -2397,7 +2399,7 @@ var TableCheckboxCell = ({ cell }) => {
|
|
|
2397
2399
|
lineHeight: 1
|
|
2398
2400
|
},
|
|
2399
2401
|
css: styles.cell,
|
|
2400
|
-
...
|
|
2402
|
+
...mergeProps11(gridCellProps, focusProps),
|
|
2401
2403
|
...stateProps
|
|
2402
2404
|
}, /* @__PURE__ */ React53.createElement(Checkbox, {
|
|
2403
2405
|
...checkboxProps
|
|
@@ -2409,7 +2411,7 @@ import React54, { useRef as useRef12 } from "react";
|
|
|
2409
2411
|
import { useFocusRing as useFocusRing11 } from "@react-aria/focus";
|
|
2410
2412
|
import { useHover as useHover6 } from "@react-aria/interactions";
|
|
2411
2413
|
import { useTableColumnHeader } from "@react-aria/table";
|
|
2412
|
-
import { mergeProps as
|
|
2414
|
+
import { mergeProps as mergeProps12 } from "@react-aria/utils";
|
|
2413
2415
|
import { Box as Box32, useStateProps as useStateProps15 } from "@marigold/system";
|
|
2414
2416
|
var SortIndicator = ({
|
|
2415
2417
|
direction = "ascending",
|
|
@@ -2447,7 +2449,7 @@ var TableColumnHeader = ({ column }) => {
|
|
|
2447
2449
|
ref,
|
|
2448
2450
|
__baseCSS: { cursor: "default" },
|
|
2449
2451
|
css: styles.header,
|
|
2450
|
-
...
|
|
2452
|
+
...mergeProps12(columnHeaderProps, hoverProps, focusProps),
|
|
2451
2453
|
...stateProps
|
|
2452
2454
|
}, column.rendered, column.props.allowsSorting && /* @__PURE__ */ React54.createElement(SortIndicator, {
|
|
2453
2455
|
direction: (_a = state.sortDescriptor) == null ? void 0 : _a.direction,
|
|
@@ -2483,7 +2485,7 @@ import React57, { useRef as useRef14 } from "react";
|
|
|
2483
2485
|
import { useFocusRing as useFocusRing12 } from "@react-aria/focus";
|
|
2484
2486
|
import { useHover as useHover7 } from "@react-aria/interactions";
|
|
2485
2487
|
import { useTableRow } from "@react-aria/table";
|
|
2486
|
-
import { mergeProps as
|
|
2488
|
+
import { mergeProps as mergeProps13 } from "@react-aria/utils";
|
|
2487
2489
|
import { Box as Box33, useComponentStyles as useComponentStyles27, useStateProps as useStateProps16 } from "@marigold/system";
|
|
2488
2490
|
var TableRow = ({ children, row }) => {
|
|
2489
2491
|
const ref = useRef14(null);
|
|
@@ -2521,7 +2523,7 @@ var TableRow = ({ children, row }) => {
|
|
|
2521
2523
|
cursor: !interactive ? "text" : disabled ? "default" : "pointer"
|
|
2522
2524
|
},
|
|
2523
2525
|
css: styles,
|
|
2524
|
-
...
|
|
2526
|
+
...mergeProps13(rowProps, focusProps, hoverProps),
|
|
2525
2527
|
...stateProps
|
|
2526
2528
|
}, children);
|
|
2527
2529
|
};
|
|
@@ -2534,7 +2536,7 @@ import {
|
|
|
2534
2536
|
useTableColumnHeader as useTableColumnHeader2,
|
|
2535
2537
|
useTableSelectAllCheckbox
|
|
2536
2538
|
} from "@react-aria/table";
|
|
2537
|
-
import { mergeProps as
|
|
2539
|
+
import { mergeProps as mergeProps14 } from "@react-aria/utils";
|
|
2538
2540
|
import { Box as Box34, useStateProps as useStateProps17 } from "@marigold/system";
|
|
2539
2541
|
var TableSelectAllCell = ({ column }) => {
|
|
2540
2542
|
const ref = useRef15(null);
|
|
@@ -2562,7 +2564,7 @@ var TableSelectAllCell = ({ column }) => {
|
|
|
2562
2564
|
lineHeight: 1
|
|
2563
2565
|
},
|
|
2564
2566
|
css: styles.header,
|
|
2565
|
-
...
|
|
2567
|
+
...mergeProps14(columnHeaderProps, hoverProps, focusProps),
|
|
2566
2568
|
...stateProps
|
|
2567
2569
|
}, /* @__PURE__ */ React58.createElement(Checkbox, {
|
|
2568
2570
|
...checkboxProps
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@marigold/components",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.1",
|
|
4
4
|
"description": "Components for the Marigold Design System",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"keywords": [
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"directory": "packages/components"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@marigold/icons": "1.1.
|
|
27
|
-
"@marigold/system": "4.2.
|
|
26
|
+
"@marigold/icons": "1.1.15",
|
|
27
|
+
"@marigold/system": "4.2.1",
|
|
28
28
|
"@marigold/tokens": "3.1.0",
|
|
29
29
|
"@marigold/types": "0.5.7",
|
|
30
30
|
"@react-aria/button": "3.6.3",
|