Skip to content

Commit 86b06de

Browse files
authored
chore: Taking use-merge-ref from toolkit (#355)
1 parent dcaa937 commit 86b06de

File tree

3 files changed

+4
-41
lines changed

3 files changed

+4
-41
lines changed

src/board/internal.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ReactNode, useEffect, useRef } from "react";
44
import { usePrevious } from "@dnd-kit/utilities";
55
import clsx from "clsx";
66

7-
import { getIsRtl } from "@cloudscape-design/component-toolkit/internal";
7+
import { getIsRtl, useMergeRefs } from "@cloudscape-design/component-toolkit/internal";
88

99
import { getDataAttributes } from "../internal/base-component/get-data-attributes";
1010
import { InternalBaseComponentProps } from "../internal/base-component/use-base-component";
@@ -26,7 +26,6 @@ import {
2626
} from "../internal/utils/layout";
2727
import { Position } from "../internal/utils/position";
2828
import { useAutoScroll } from "../internal/utils/use-auto-scroll";
29-
import { useMergeRefs } from "../internal/utils/use-merge-refs";
3029
import { BoardProps } from "./interfaces";
3130
import Placeholder from "./placeholder";
3231
import { selectTransitionRows, useTransition } from "./transition";

src/internal/grid/grid.tsx

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,19 @@ import { Children, useRef } from "react";
55
import clsx from "clsx";
66

77
import { useContainerQuery } from "@cloudscape-design/component-toolkit";
8-
import { useDensityMode } from "@cloudscape-design/component-toolkit/internal";
8+
import { useDensityMode, useMergeRefs } from "@cloudscape-design/component-toolkit/internal";
99

10-
import { useMergeRefs } from "../utils/use-merge-refs";
1110
import { zipTwoArrays } from "../utils/zip-arrays";
1211
import { GridProps } from "./interfaces";
1312
import GridItem from "./item";
1413

1514
import styles from "./styles.css.js";
1615

1716
/* Matches grid gap in CSS. */
18-
const GRID_GAP = {
19-
comfortable: 20,
20-
compact: 16,
21-
};
17+
const GRID_GAP = { comfortable: 20, compact: 16 };
2218

2319
/* Matches grid-auto-rows in CSS. */
24-
const ROWSPAN_HEIGHT = {
25-
comfortable: 96,
26-
compact: 76,
27-
};
20+
const ROWSPAN_HEIGHT = { comfortable: 96, compact: 76 };
2821

2922
export default function Grid({ layout, children: render, columns, isRtl }: GridProps) {
3023
const gridRef = useRef<HTMLDivElement>(null);

src/internal/utils/use-merge-refs.tsx

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)