@dxos/react-ui-masonry 0.8.4-main.ae835ea → 0.8.4-main.bcb3aa67d6

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.
@@ -1,78 +1,116 @@
1
1
  // src/Masonry.tsx
2
2
  import { useComposedRefs } from "@radix-ui/react-compose-refs";
3
- import { useMasonry, usePositioner, useResizeObserver } from "masonic";
4
- import React, { forwardRef, useMemo, useRef } from "react";
5
- import { useScroller, useSize } from "@dxos/react-hooks";
6
- import { usePx } from "@dxos/react-ui";
7
- import { mx } from "@dxos/react-ui-theme";
8
- var usePxProps = (remProps) => {
9
- const remInPx = usePx(1);
10
- return useMemo(() => {
11
- return Object.fromEntries(Object.entries(remProps).filter(([_, value]) => Number.isFinite(value)).map(([key, value]) => {
12
- return [
13
- key,
14
- value * remInPx
15
- ];
16
- }));
17
- }, [
18
- remProps,
19
- remInPx
20
- ]);
21
- };
22
- var MasonryRootImpl = ({ columnCount, maxColumnCount, columnWidth = 18, maxColumnWidth = 22, columnGutter = 1, rowGutter, items, itemHeightEstimate = 256, itemKey, overscanBy = 6, render, onRender, classNames, intrinsicHeight, ...props }, forwardedRef) => {
3
+ import { createContext } from "@radix-ui/react-context";
4
+ import { VirtuosoMasonry } from "@virtuoso.dev/masonry";
5
+ import React, { useMemo, useRef } from "react";
6
+ import { useResizeDetector } from "react-resize-detector";
7
+ import { ScrollArea, usePx } from "@dxos/react-ui";
8
+ import { cardMaxInlineSize, cardMinInlineSize, composable, composableProps, scrollbar } from "@dxos/ui-theme";
9
+ var MASONRY_NAME = "Masonry";
10
+ var [MasonryProvider, useMasonryContext] = createContext(MASONRY_NAME);
11
+ var MasonryRoot = ({ children, Tile, columns = void 0, maxColumns = void 0, minColumnWidth = cardMinInlineSize, maxColumnWidth = cardMaxInlineSize, gutter = 0.75 }) => /* @__PURE__ */ React.createElement(MasonryProvider, {
12
+ Tile,
13
+ columns,
14
+ maxColumns,
15
+ minColumnWidth,
16
+ maxColumnWidth,
17
+ gutter
18
+ }, children);
19
+ MasonryRoot.displayName = "Masonry.Root";
20
+ var MasonryContentInner = composable(({ items, getId, ...props }, forwardedRef) => {
23
21
  const rootRef = useRef(null);
24
- const ref = useComposedRefs(rootRef, forwardedRef);
25
- const { width, height } = useSize(rootRef);
26
- const { scrollTop, isScrolling } = useScroller(rootRef);
27
- const remProps = useMemo(() => ({
28
- columnWidth,
29
- maxColumnWidth,
30
- columnGutter,
31
- rowGutter
32
- }), [
33
- columnWidth,
34
- maxColumnWidth,
35
- columnGutter,
36
- rowGutter
22
+ const composedRef = useComposedRefs(rootRef, forwardedRef);
23
+ const { width = 0 } = useResizeDetector({
24
+ targetRef: rootRef
25
+ });
26
+ const { Tile, columns, maxColumns, minColumnWidth, maxColumnWidth, gutter } = useMasonryContext("Masonry.Content");
27
+ const columnCount = useColumnCount(width - (scrollbar.thin.size + scrollbar.thin.padding), columns, maxColumns, minColumnWidth, maxColumnWidth, gutter);
28
+ const TileAdapter = useMemo(() => {
29
+ const Adapter = ({ data, index }) => {
30
+ return /* @__PURE__ */ React.createElement("div", {
31
+ role: "listitem",
32
+ style: {
33
+ paddingBottom: `${gutter}rem`
34
+ }
35
+ }, /* @__PURE__ */ React.createElement(Tile, {
36
+ index,
37
+ data
38
+ }));
39
+ };
40
+ Adapter.displayName = "Masonry.TileAdapter";
41
+ return Adapter;
42
+ }, [
43
+ Tile,
44
+ gutter
37
45
  ]);
38
- const pxProps = usePxProps(remProps);
39
- const positionerProps = useMemo(() => ({
40
- width,
46
+ if (columns === 1) {
47
+ return /* @__PURE__ */ React.createElement(VirtuosoMasonry, {
48
+ data: items,
49
+ columnCount: 1,
50
+ ItemContent: TileAdapter,
51
+ useWindowScroll: true
52
+ });
53
+ }
54
+ return /* @__PURE__ */ React.createElement(ScrollArea.Root, {
55
+ ...composableProps(props, {
56
+ classNames: "w-"
57
+ }),
58
+ thin: true,
59
+ padding: true,
60
+ ref: composedRef
61
+ }, /* @__PURE__ */ React.createElement(ScrollArea.Viewport, {
62
+ asChild: true
63
+ }, width > 0 && /* @__PURE__ */ React.createElement(ComposableVirtuosoMasonry, {
64
+ style: {
65
+ gap: `${gutter}rem`
66
+ },
67
+ data: items,
41
68
  columnCount,
42
- maxColumnCount,
43
- ...pxProps
44
- }), [
69
+ ItemContent: TileAdapter
70
+ })));
71
+ });
72
+ var ComposableVirtuosoMasonry = composable(({ ...props }) => {
73
+ return /* @__PURE__ */ React.createElement(VirtuosoMasonry, props);
74
+ });
75
+ MasonryContentInner.displayName = "Masonry.Content";
76
+ var MasonryContent = MasonryContentInner;
77
+ var useColumnCount = (width, columns, maxColumns, minColumnWidth, maxColumnWidth, gutter) => {
78
+ const remInPx = usePx(1);
79
+ return useMemo(() => {
80
+ if (columns != null) {
81
+ return columns;
82
+ }
83
+ const minColumnWidthPx = minColumnWidth * remInPx;
84
+ const maxColumnWidthPx = maxColumnWidth * remInPx;
85
+ const gutterPx = gutter * remInPx;
86
+ if (width <= 0 || minColumnWidthPx <= 0) {
87
+ return 1;
88
+ }
89
+ let cols = Math.floor(width / (minColumnWidthPx + gutterPx));
90
+ if (maxColumnWidthPx > 0) {
91
+ const effectiveColWidth = width / cols - gutterPx;
92
+ if (effectiveColWidth > maxColumnWidthPx) {
93
+ const maxCols = Math.ceil(width / (maxColumnWidthPx + gutterPx));
94
+ if (width / maxCols - gutterPx >= minColumnWidthPx) {
95
+ cols = maxCols;
96
+ }
97
+ }
98
+ }
99
+ const clamped = maxColumns != null ? Math.min(cols, maxColumns) : cols;
100
+ return Math.max(1, clamped);
101
+ }, [
102
+ remInPx,
45
103
  width,
46
- pxProps,
47
- columnCount,
48
- maxColumnCount
49
- ]);
50
- const positioner = usePositioner(positionerProps, [
51
- positionerProps
104
+ columns,
105
+ maxColumns,
106
+ minColumnWidth,
107
+ maxColumnWidth,
108
+ gutter
52
109
  ]);
53
- const resizeObserver = useResizeObserver(positioner);
54
- const children = useMasonry({
55
- height: intrinsicHeight ? Infinity : height,
56
- scrollTop,
57
- isScrolling,
58
- resizeObserver,
59
- positioner,
60
- items,
61
- itemHeightEstimate,
62
- itemKey,
63
- overscanBy,
64
- render,
65
- onRender
66
- });
67
- return /* @__PURE__ */ React.createElement("div", {
68
- className: mx(classNames),
69
- ...props,
70
- ref
71
- }, children);
72
110
  };
73
- var MasonryRoot = /* @__PURE__ */ forwardRef(MasonryRootImpl);
74
111
  var Masonry = {
75
- Root: MasonryRoot
112
+ Root: MasonryRoot,
113
+ Content: MasonryContent
76
114
  };
77
115
  export {
78
116
  Masonry
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/Masonry.tsx"],
4
- "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { useComposedRefs } from '@radix-ui/react-compose-refs';\nimport {\n type UseMasonryOptions,\n type UsePositionerOptions,\n useMasonry,\n usePositioner,\n useResizeObserver,\n} from 'masonic';\nimport React, {\n type ComponentPropsWithRef,\n type ForwardedRef,\n type JSX,\n type Ref,\n forwardRef,\n useMemo,\n useRef,\n} from 'react';\n\nimport { useScroller, useSize } from '@dxos/react-hooks';\nimport { type ThemedClassName, usePx } from '@dxos/react-ui';\nimport { mx } from '@dxos/react-ui-theme';\n\ntype MasonryRootProps<Item> = ThemedClassName<ComponentPropsWithRef<'div'>> &\n Omit<UsePositionerOptions, 'width'> &\n Omit<\n UseMasonryOptions<Item>,\n | 'height'\n | 'scrollTop'\n | 'isScrolling'\n | 'resizeObserver'\n | 'positioner'\n | 'as'\n | 'id'\n | 'itemAs'\n | 'itemStyle'\n | 'className'\n | 'style'\n | 'role'\n | 'tabIndex'\n | 'containerRef'\n > & { intrinsicHeight?: boolean };\n\nconst usePxProps = (remProps: Omit<UsePositionerOptions, 'width' | 'columnCount' | 'maxColumnCount'>) => {\n const remInPx = usePx(1);\n return useMemo(() => {\n return Object.fromEntries(\n Object.entries(remProps)\n .filter(([_, value]) => Number.isFinite(value))\n .map(([key, value]) => {\n return [key, value * remInPx];\n }),\n );\n }, [remProps, remInPx]);\n};\n\n// TODO(burdon): Currently not responsive to width.\nconst MasonryRootImpl = <Item,>(\n {\n columnCount,\n maxColumnCount,\n columnWidth = 18, // cardMaxWidth\n maxColumnWidth = 22,\n columnGutter = 1,\n rowGutter,\n items,\n itemHeightEstimate = 256,\n itemKey,\n overscanBy = 6,\n render,\n onRender,\n classNames,\n intrinsicHeight,\n ...props\n }: MasonryRootProps<Item>,\n forwardedRef: ForwardedRef<HTMLDivElement>,\n) => {\n const rootRef = useRef<HTMLDivElement | null>(null);\n const ref = useComposedRefs(rootRef, forwardedRef);\n const { width, height } = useSize(rootRef);\n const { scrollTop, isScrolling } = useScroller(rootRef);\n const remProps = useMemo(\n () => ({ columnWidth, maxColumnWidth, columnGutter, rowGutter }),\n [columnWidth, maxColumnWidth, columnGutter, rowGutter],\n );\n const pxProps = usePxProps(remProps);\n const positionerProps = useMemo<UsePositionerOptions>(\n () => ({\n width,\n columnCount,\n maxColumnCount,\n ...pxProps,\n }),\n [width, pxProps, columnCount, maxColumnCount],\n );\n const positioner = usePositioner(positionerProps, [positionerProps]);\n const resizeObserver = useResizeObserver(positioner);\n const children = useMasonry({\n height: intrinsicHeight ? Infinity : height,\n scrollTop,\n isScrolling,\n resizeObserver,\n positioner,\n items,\n itemHeightEstimate,\n itemKey,\n overscanBy,\n render,\n onRender,\n });\n\n return (\n <div className={mx(classNames)} {...props} ref={ref}>\n {children}\n </div>\n );\n};\n\nconst MasonryRoot = forwardRef(MasonryRootImpl) as <Item>(\n props: MasonryRootProps<Item> & {\n ref?: Ref<HTMLDivElement | null>;\n },\n) => JSX.Element;\n\nexport const Masonry = {\n Root: MasonryRoot,\n};\n\nexport type { MasonryRootProps };\n"],
5
- "mappings": ";AAIA,SAASA,uBAAuB;AAChC,SAGEC,YACAC,eACAC,yBACK;AACP,OAAOC,SAKLC,YACAC,SACAC,cACK;AAEP,SAASC,aAAaC,eAAe;AACrC,SAA+BC,aAAa;AAC5C,SAASC,UAAU;AAsBnB,IAAMC,aAAa,CAACC,aAAAA;AAClB,QAAMC,UAAUC,MAAM,CAAA;AACtB,SAAOC,QAAQ,MAAA;AACb,WAAOC,OAAOC,YACZD,OAAOE,QAAQN,QAAAA,EACZO,OAAO,CAAC,CAACC,GAAGC,KAAAA,MAAWC,OAAOC,SAASF,KAAAA,CAAAA,EACvCG,IAAI,CAAC,CAACC,KAAKJ,KAAAA,MAAM;AAChB,aAAO;QAACI;QAAKJ,QAAQR;;IACvB,CAAA,CAAA;EAEN,GAAG;IAACD;IAAUC;GAAQ;AACxB;AAGA,IAAMa,kBAAkB,CACtB,EACEC,aACAC,gBACAC,cAAc,IACdC,iBAAiB,IACjBC,eAAe,GACfC,WACAC,OACAC,qBAAqB,KACrBC,SACAC,aAAa,GACbC,QACAC,UACAC,YACAC,iBACA,GAAGC,MAAAA,GAELC,iBAAAA;AAEA,QAAMC,UAAUC,OAA8B,IAAA;AAC9C,QAAMC,MAAMC,gBAAgBH,SAASD,YAAAA;AACrC,QAAM,EAAEK,OAAOC,OAAM,IAAKC,QAAQN,OAAAA;AAClC,QAAM,EAAEO,WAAWC,YAAW,IAAKC,YAAYT,OAAAA;AAC/C,QAAM/B,WAAWG,QACf,OAAO;IAAEc;IAAaC;IAAgBC;IAAcC;EAAU,IAC9D;IAACH;IAAaC;IAAgBC;IAAcC;GAAU;AAExD,QAAMqB,UAAU1C,WAAWC,QAAAA;AAC3B,QAAM0C,kBAAkBvC,QACtB,OAAO;IACLgC;IACApB;IACAC;IACA,GAAGyB;EACL,IACA;IAACN;IAAOM;IAAS1B;IAAaC;GAAe;AAE/C,QAAM2B,aAAaC,cAAcF,iBAAiB;IAACA;GAAgB;AACnE,QAAMG,iBAAiBC,kBAAkBH,UAAAA;AACzC,QAAMI,WAAWC,WAAW;IAC1BZ,QAAQR,kBAAkBqB,WAAWb;IACrCE;IACAC;IACAM;IACAF;IACAtB;IACAC;IACAC;IACAC;IACAC;IACAC;EACF,CAAA;AAEA,SACE,sBAAA,cAACwB,OAAAA;IAAIC,WAAWC,GAAGzB,UAAAA;IAAc,GAAGE;IAAOI;KACxCc,QAAAA;AAGP;AAEA,IAAMM,cAAcC,2BAAWxC,eAAAA;AAMxB,IAAMyC,UAAU;EACrBC,MAAMH;AACR;",
6
- "names": ["useComposedRefs", "useMasonry", "usePositioner", "useResizeObserver", "React", "forwardRef", "useMemo", "useRef", "useScroller", "useSize", "usePx", "mx", "usePxProps", "remProps", "remInPx", "usePx", "useMemo", "Object", "fromEntries", "entries", "filter", "_", "value", "Number", "isFinite", "map", "key", "MasonryRootImpl", "columnCount", "maxColumnCount", "columnWidth", "maxColumnWidth", "columnGutter", "rowGutter", "items", "itemHeightEstimate", "itemKey", "overscanBy", "render", "onRender", "classNames", "intrinsicHeight", "props", "forwardedRef", "rootRef", "useRef", "ref", "useComposedRefs", "width", "height", "useSize", "scrollTop", "isScrolling", "useScroller", "pxProps", "positionerProps", "positioner", "usePositioner", "resizeObserver", "useResizeObserver", "children", "useMasonry", "Infinity", "div", "className", "mx", "MasonryRoot", "forwardRef", "Masonry", "Root"]
4
+ "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { useComposedRefs } from '@radix-ui/react-compose-refs';\nimport { createContext } from '@radix-ui/react-context';\nimport { VirtuosoMasonry, type VirtuosoMasonryProps } from '@virtuoso.dev/masonry';\nimport React, { type ComponentType, type JSX, type PropsWithChildren, type Ref, useMemo, useRef } from 'react';\nimport { useResizeDetector } from 'react-resize-detector';\n\nimport { ScrollArea, usePx } from '@dxos/react-ui';\nimport { cardMaxInlineSize, cardMinInlineSize, composable, composableProps, scrollbar } from '@dxos/ui-theme';\n\n//\n// Context\n//\n\ntype MasonryContextValue = {\n /** Render component for each masonry item. */\n Tile: ComponentType<{ data: any; index: number }>;\n /** Override auto-calculated column count. */\n columns: number | undefined;\n /** Upper bound on number of columns. */\n maxColumns: number | undefined;\n /** Minimum column width in rem. */\n minColumnWidth: number;\n /** Maximum column width in rem. */\n maxColumnWidth: number;\n /** Space between columns and rows in rem. */\n gutter: number;\n};\n\nconst MASONRY_NAME = 'Masonry';\n\nconst [MasonryProvider, useMasonryContext] = createContext<MasonryContextValue>(MASONRY_NAME);\n\n//\n// Root\n//\n\ntype MasonryRootProps = PropsWithChildren<Partial<MasonryContextValue>>;\n\nconst MasonryRoot = ({\n children,\n Tile,\n columns = undefined,\n maxColumns = undefined,\n minColumnWidth = cardMinInlineSize,\n maxColumnWidth = cardMaxInlineSize,\n gutter = 0.75,\n}: MasonryRootProps) => (\n <MasonryProvider\n Tile={Tile!}\n columns={columns}\n maxColumns={maxColumns}\n minColumnWidth={minColumnWidth}\n maxColumnWidth={maxColumnWidth}\n gutter={gutter}\n >\n {children}\n </MasonryProvider>\n);\n\nMasonryRoot.displayName = 'Masonry.Root';\n\n//\n// Content\n//\n\ntype MasonryContentProps<Item> = {\n /** Items to render in the masonry grid. */\n items: Item[];\n /** Extract a stable key from an item, aligned with react-ui-mosaic's getId. */\n getId?: (data: Item) => string;\n};\n\nconst MasonryContentInner = composable<HTMLDivElement, MasonryContentProps<any>>(\n ({ items, getId, ...props }, forwardedRef) => {\n const rootRef = useRef<HTMLDivElement | null>(null);\n const composedRef = useComposedRefs(rootRef, forwardedRef);\n const { width = 0 } = useResizeDetector({ targetRef: rootRef });\n\n const { Tile, columns, maxColumns, minColumnWidth, maxColumnWidth, gutter } = useMasonryContext('Masonry.Content');\n const columnCount = useColumnCount(\n width - (scrollbar.thin.size + scrollbar.thin.padding),\n columns,\n maxColumns,\n minColumnWidth,\n maxColumnWidth,\n gutter,\n );\n\n const TileAdapter = useMemo(() => {\n const Adapter = ({ data, index }: { data: any; index: number }) => {\n return (\n <div role='listitem' style={{ paddingBottom: `${gutter}rem` }}>\n <Tile index={index} data={data} />\n </div>\n );\n };\n Adapter.displayName = 'Masonry.TileAdapter';\n return Adapter;\n }, [Tile, gutter]);\n\n // TODO(burdon): Masonry currently doesn't support an external scroller.\n // https://github.com/petyosi/react-virtuoso/issues/1305\n if (columns === 1) {\n return <VirtuosoMasonry data={items} columnCount={1} ItemContent={TileAdapter} useWindowScroll />;\n }\n\n return (\n <ScrollArea.Root {...composableProps(props, { classNames: 'w-' })} thin padding ref={composedRef}>\n <ScrollArea.Viewport asChild>\n {width > 0 && (\n <ComposableVirtuosoMasonry\n style={{ gap: `${gutter}rem` }}\n data={items}\n columnCount={columnCount}\n ItemContent={TileAdapter}\n />\n )}\n </ScrollArea.Viewport>\n </ScrollArea.Root>\n );\n },\n);\n\nconst ComposableVirtuosoMasonry = composable<HTMLDivElement, VirtuosoMasonryProps<any, any>>(({ ...props }) => {\n return <VirtuosoMasonry {...props} />;\n});\n\nMasonryContentInner.displayName = 'Masonry.Content';\n\nconst MasonryContent = MasonryContentInner as <Item>(\n props: MasonryContentProps<Item> & {\n ref?: Ref<HTMLDivElement | null>;\n },\n) => JSX.Element;\n\n/** Compute column count from container width and column constraints. */\nconst useColumnCount = (\n width: number,\n columns: number | undefined,\n maxColumns: number | undefined,\n minColumnWidth: number,\n maxColumnWidth: number,\n gutter: number,\n) => {\n const remInPx = usePx(1);\n return useMemo(() => {\n if (columns != null) {\n return columns;\n }\n\n const minColumnWidthPx = minColumnWidth * remInPx;\n const maxColumnWidthPx = maxColumnWidth * remInPx;\n const gutterPx = gutter * remInPx;\n\n if (width <= 0 || minColumnWidthPx <= 0) {\n return 1;\n }\n\n // Each tile has paddingRight: gutter, so every slot (including the last) occupies\n // (colWidth + gutterPx). The container therefore fits floor(containerWidth / (colWidth + gutterPx)) columns.\n let cols = Math.floor(width / (minColumnWidthPx + gutterPx));\n if (maxColumnWidthPx > 0) {\n const effectiveColWidth = width / cols - gutterPx;\n if (effectiveColWidth > maxColumnWidthPx) {\n // Try to add columns to keep cards below maxColumnWidth, but never violate minColumnWidth.\n const maxCols = Math.ceil(width / (maxColumnWidthPx + gutterPx));\n if (width / maxCols - gutterPx >= minColumnWidthPx) {\n cols = maxCols;\n }\n }\n }\n\n const clamped = maxColumns != null ? Math.min(cols, maxColumns) : cols;\n return Math.max(1, clamped);\n }, [remInPx, width, columns, maxColumns, minColumnWidth, maxColumnWidth, gutter]);\n};\n\n//\n// Masonry\n//\n\nexport const Masonry = {\n Root: MasonryRoot,\n Content: MasonryContent,\n};\n\nexport type { MasonryRootProps, MasonryContentProps };\n"],
5
+ "mappings": "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",
6
+ "names": ["useComposedRefs", "createContext", "VirtuosoMasonry", "React", "useMemo", "useRef", "useResizeDetector", "ScrollArea", "usePx", "cardMaxInlineSize", "cardMinInlineSize", "composable", "composableProps", "scrollbar", "MASONRY_NAME", "MasonryProvider", "useMasonryContext", "createContext", "MasonryRoot", "children", "Tile", "columns", "undefined", "maxColumns", "minColumnWidth", "cardMinInlineSize", "maxColumnWidth", "cardMaxInlineSize", "gutter", "displayName", "MasonryContentInner", "composable", "items", "getId", "props", "forwardedRef", "rootRef", "useRef", "composedRef", "useComposedRefs", "width", "useResizeDetector", "targetRef", "columnCount", "useColumnCount", "scrollbar", "thin", "size", "padding", "TileAdapter", "useMemo", "Adapter", "data", "index", "div", "role", "style", "paddingBottom", "VirtuosoMasonry", "ItemContent", "useWindowScroll", "ScrollArea", "Root", "composableProps", "classNames", "ref", "Viewport", "asChild", "ComposableVirtuosoMasonry", "gap", "MasonryContent", "remInPx", "usePx", "minColumnWidthPx", "maxColumnWidthPx", "gutterPx", "cols", "Math", "floor", "effectiveColWidth", "maxCols", "ceil", "clamped", "min", "max", "Masonry", "Content"]
7
7
  }
@@ -1 +1 @@
1
- {"inputs":{"src/Masonry.tsx":{"bytes":10108,"imports":[{"path":"@radix-ui/react-compose-refs","kind":"import-statement","external":true},{"path":"masonic","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/react-hooks","kind":"import-statement","external":true},{"path":"@dxos/react-ui","kind":"import-statement","external":true},{"path":"@dxos/react-ui-theme","kind":"import-statement","external":true}],"format":"esm"},"src/index.ts":{"bytes":454,"imports":[{"path":"src/Masonry.tsx","kind":"import-statement","original":"./Masonry"}],"format":"esm"}},"outputs":{"dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":5673},"dist/lib/browser/index.mjs":{"imports":[{"path":"@radix-ui/react-compose-refs","kind":"import-statement","external":true},{"path":"masonic","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/react-hooks","kind":"import-statement","external":true},{"path":"@dxos/react-ui","kind":"import-statement","external":true},{"path":"@dxos/react-ui-theme","kind":"import-statement","external":true}],"exports":["Masonry"],"entryPoint":"src/index.ts","inputs":{"src/Masonry.tsx":{"bytesInOutput":2126},"src/index.ts":{"bytesInOutput":0}},"bytes":2202}}}
1
+ {"inputs":{"src/Masonry.tsx":{"bytes":18020,"imports":[{"path":"@radix-ui/react-compose-refs","kind":"import-statement","external":true},{"path":"@radix-ui/react-context","kind":"import-statement","external":true},{"path":"@virtuoso.dev/masonry","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"react-resize-detector","kind":"import-statement","external":true},{"path":"@dxos/react-ui","kind":"import-statement","external":true},{"path":"@dxos/ui-theme","kind":"import-statement","external":true}],"format":"esm"},"src/index.ts":{"bytes":454,"imports":[{"path":"src/Masonry.tsx","kind":"import-statement","original":"./Masonry"}],"format":"esm"}},"outputs":{"dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":9668},"dist/lib/browser/index.mjs":{"imports":[{"path":"@radix-ui/react-compose-refs","kind":"import-statement","external":true},{"path":"@radix-ui/react-context","kind":"import-statement","external":true},{"path":"@virtuoso.dev/masonry","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"react-resize-detector","kind":"import-statement","external":true},{"path":"@dxos/react-ui","kind":"import-statement","external":true},{"path":"@dxos/ui-theme","kind":"import-statement","external":true}],"exports":["Masonry"],"entryPoint":"src/index.ts","inputs":{"src/Masonry.tsx":{"bytesInOutput":3876},"src/index.ts":{"bytesInOutput":0}},"bytes":3952}}}
@@ -2,79 +2,117 @@ import { createRequire } from 'node:module';const require = createRequire(import
2
2
 
3
3
  // src/Masonry.tsx
4
4
  import { useComposedRefs } from "@radix-ui/react-compose-refs";
5
- import { useMasonry, usePositioner, useResizeObserver } from "masonic";
6
- import React, { forwardRef, useMemo, useRef } from "react";
7
- import { useScroller, useSize } from "@dxos/react-hooks";
8
- import { usePx } from "@dxos/react-ui";
9
- import { mx } from "@dxos/react-ui-theme";
10
- var usePxProps = (remProps) => {
11
- const remInPx = usePx(1);
12
- return useMemo(() => {
13
- return Object.fromEntries(Object.entries(remProps).filter(([_, value]) => Number.isFinite(value)).map(([key, value]) => {
14
- return [
15
- key,
16
- value * remInPx
17
- ];
18
- }));
19
- }, [
20
- remProps,
21
- remInPx
22
- ]);
23
- };
24
- var MasonryRootImpl = ({ columnCount, maxColumnCount, columnWidth = 18, maxColumnWidth = 22, columnGutter = 1, rowGutter, items, itemHeightEstimate = 256, itemKey, overscanBy = 6, render, onRender, classNames, intrinsicHeight, ...props }, forwardedRef) => {
5
+ import { createContext } from "@radix-ui/react-context";
6
+ import { VirtuosoMasonry } from "@virtuoso.dev/masonry";
7
+ import React, { useMemo, useRef } from "react";
8
+ import { useResizeDetector } from "react-resize-detector";
9
+ import { ScrollArea, usePx } from "@dxos/react-ui";
10
+ import { cardMaxInlineSize, cardMinInlineSize, composable, composableProps, scrollbar } from "@dxos/ui-theme";
11
+ var MASONRY_NAME = "Masonry";
12
+ var [MasonryProvider, useMasonryContext] = createContext(MASONRY_NAME);
13
+ var MasonryRoot = ({ children, Tile, columns = void 0, maxColumns = void 0, minColumnWidth = cardMinInlineSize, maxColumnWidth = cardMaxInlineSize, gutter = 0.75 }) => /* @__PURE__ */ React.createElement(MasonryProvider, {
14
+ Tile,
15
+ columns,
16
+ maxColumns,
17
+ minColumnWidth,
18
+ maxColumnWidth,
19
+ gutter
20
+ }, children);
21
+ MasonryRoot.displayName = "Masonry.Root";
22
+ var MasonryContentInner = composable(({ items, getId, ...props }, forwardedRef) => {
25
23
  const rootRef = useRef(null);
26
- const ref = useComposedRefs(rootRef, forwardedRef);
27
- const { width, height } = useSize(rootRef);
28
- const { scrollTop, isScrolling } = useScroller(rootRef);
29
- const remProps = useMemo(() => ({
30
- columnWidth,
31
- maxColumnWidth,
32
- columnGutter,
33
- rowGutter
34
- }), [
35
- columnWidth,
36
- maxColumnWidth,
37
- columnGutter,
38
- rowGutter
24
+ const composedRef = useComposedRefs(rootRef, forwardedRef);
25
+ const { width = 0 } = useResizeDetector({
26
+ targetRef: rootRef
27
+ });
28
+ const { Tile, columns, maxColumns, minColumnWidth, maxColumnWidth, gutter } = useMasonryContext("Masonry.Content");
29
+ const columnCount = useColumnCount(width - (scrollbar.thin.size + scrollbar.thin.padding), columns, maxColumns, minColumnWidth, maxColumnWidth, gutter);
30
+ const TileAdapter = useMemo(() => {
31
+ const Adapter = ({ data, index }) => {
32
+ return /* @__PURE__ */ React.createElement("div", {
33
+ role: "listitem",
34
+ style: {
35
+ paddingBottom: `${gutter}rem`
36
+ }
37
+ }, /* @__PURE__ */ React.createElement(Tile, {
38
+ index,
39
+ data
40
+ }));
41
+ };
42
+ Adapter.displayName = "Masonry.TileAdapter";
43
+ return Adapter;
44
+ }, [
45
+ Tile,
46
+ gutter
39
47
  ]);
40
- const pxProps = usePxProps(remProps);
41
- const positionerProps = useMemo(() => ({
42
- width,
48
+ if (columns === 1) {
49
+ return /* @__PURE__ */ React.createElement(VirtuosoMasonry, {
50
+ data: items,
51
+ columnCount: 1,
52
+ ItemContent: TileAdapter,
53
+ useWindowScroll: true
54
+ });
55
+ }
56
+ return /* @__PURE__ */ React.createElement(ScrollArea.Root, {
57
+ ...composableProps(props, {
58
+ classNames: "w-"
59
+ }),
60
+ thin: true,
61
+ padding: true,
62
+ ref: composedRef
63
+ }, /* @__PURE__ */ React.createElement(ScrollArea.Viewport, {
64
+ asChild: true
65
+ }, width > 0 && /* @__PURE__ */ React.createElement(ComposableVirtuosoMasonry, {
66
+ style: {
67
+ gap: `${gutter}rem`
68
+ },
69
+ data: items,
43
70
  columnCount,
44
- maxColumnCount,
45
- ...pxProps
46
- }), [
71
+ ItemContent: TileAdapter
72
+ })));
73
+ });
74
+ var ComposableVirtuosoMasonry = composable(({ ...props }) => {
75
+ return /* @__PURE__ */ React.createElement(VirtuosoMasonry, props);
76
+ });
77
+ MasonryContentInner.displayName = "Masonry.Content";
78
+ var MasonryContent = MasonryContentInner;
79
+ var useColumnCount = (width, columns, maxColumns, minColumnWidth, maxColumnWidth, gutter) => {
80
+ const remInPx = usePx(1);
81
+ return useMemo(() => {
82
+ if (columns != null) {
83
+ return columns;
84
+ }
85
+ const minColumnWidthPx = minColumnWidth * remInPx;
86
+ const maxColumnWidthPx = maxColumnWidth * remInPx;
87
+ const gutterPx = gutter * remInPx;
88
+ if (width <= 0 || minColumnWidthPx <= 0) {
89
+ return 1;
90
+ }
91
+ let cols = Math.floor(width / (minColumnWidthPx + gutterPx));
92
+ if (maxColumnWidthPx > 0) {
93
+ const effectiveColWidth = width / cols - gutterPx;
94
+ if (effectiveColWidth > maxColumnWidthPx) {
95
+ const maxCols = Math.ceil(width / (maxColumnWidthPx + gutterPx));
96
+ if (width / maxCols - gutterPx >= minColumnWidthPx) {
97
+ cols = maxCols;
98
+ }
99
+ }
100
+ }
101
+ const clamped = maxColumns != null ? Math.min(cols, maxColumns) : cols;
102
+ return Math.max(1, clamped);
103
+ }, [
104
+ remInPx,
47
105
  width,
48
- pxProps,
49
- columnCount,
50
- maxColumnCount
51
- ]);
52
- const positioner = usePositioner(positionerProps, [
53
- positionerProps
106
+ columns,
107
+ maxColumns,
108
+ minColumnWidth,
109
+ maxColumnWidth,
110
+ gutter
54
111
  ]);
55
- const resizeObserver = useResizeObserver(positioner);
56
- const children = useMasonry({
57
- height: intrinsicHeight ? Infinity : height,
58
- scrollTop,
59
- isScrolling,
60
- resizeObserver,
61
- positioner,
62
- items,
63
- itemHeightEstimate,
64
- itemKey,
65
- overscanBy,
66
- render,
67
- onRender
68
- });
69
- return /* @__PURE__ */ React.createElement("div", {
70
- className: mx(classNames),
71
- ...props,
72
- ref
73
- }, children);
74
112
  };
75
- var MasonryRoot = /* @__PURE__ */ forwardRef(MasonryRootImpl);
76
113
  var Masonry = {
77
- Root: MasonryRoot
114
+ Root: MasonryRoot,
115
+ Content: MasonryContent
78
116
  };
79
117
  export {
80
118
  Masonry
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/Masonry.tsx"],
4
- "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { useComposedRefs } from '@radix-ui/react-compose-refs';\nimport {\n type UseMasonryOptions,\n type UsePositionerOptions,\n useMasonry,\n usePositioner,\n useResizeObserver,\n} from 'masonic';\nimport React, {\n type ComponentPropsWithRef,\n type ForwardedRef,\n type JSX,\n type Ref,\n forwardRef,\n useMemo,\n useRef,\n} from 'react';\n\nimport { useScroller, useSize } from '@dxos/react-hooks';\nimport { type ThemedClassName, usePx } from '@dxos/react-ui';\nimport { mx } from '@dxos/react-ui-theme';\n\ntype MasonryRootProps<Item> = ThemedClassName<ComponentPropsWithRef<'div'>> &\n Omit<UsePositionerOptions, 'width'> &\n Omit<\n UseMasonryOptions<Item>,\n | 'height'\n | 'scrollTop'\n | 'isScrolling'\n | 'resizeObserver'\n | 'positioner'\n | 'as'\n | 'id'\n | 'itemAs'\n | 'itemStyle'\n | 'className'\n | 'style'\n | 'role'\n | 'tabIndex'\n | 'containerRef'\n > & { intrinsicHeight?: boolean };\n\nconst usePxProps = (remProps: Omit<UsePositionerOptions, 'width' | 'columnCount' | 'maxColumnCount'>) => {\n const remInPx = usePx(1);\n return useMemo(() => {\n return Object.fromEntries(\n Object.entries(remProps)\n .filter(([_, value]) => Number.isFinite(value))\n .map(([key, value]) => {\n return [key, value * remInPx];\n }),\n );\n }, [remProps, remInPx]);\n};\n\n// TODO(burdon): Currently not responsive to width.\nconst MasonryRootImpl = <Item,>(\n {\n columnCount,\n maxColumnCount,\n columnWidth = 18, // cardMaxWidth\n maxColumnWidth = 22,\n columnGutter = 1,\n rowGutter,\n items,\n itemHeightEstimate = 256,\n itemKey,\n overscanBy = 6,\n render,\n onRender,\n classNames,\n intrinsicHeight,\n ...props\n }: MasonryRootProps<Item>,\n forwardedRef: ForwardedRef<HTMLDivElement>,\n) => {\n const rootRef = useRef<HTMLDivElement | null>(null);\n const ref = useComposedRefs(rootRef, forwardedRef);\n const { width, height } = useSize(rootRef);\n const { scrollTop, isScrolling } = useScroller(rootRef);\n const remProps = useMemo(\n () => ({ columnWidth, maxColumnWidth, columnGutter, rowGutter }),\n [columnWidth, maxColumnWidth, columnGutter, rowGutter],\n );\n const pxProps = usePxProps(remProps);\n const positionerProps = useMemo<UsePositionerOptions>(\n () => ({\n width,\n columnCount,\n maxColumnCount,\n ...pxProps,\n }),\n [width, pxProps, columnCount, maxColumnCount],\n );\n const positioner = usePositioner(positionerProps, [positionerProps]);\n const resizeObserver = useResizeObserver(positioner);\n const children = useMasonry({\n height: intrinsicHeight ? Infinity : height,\n scrollTop,\n isScrolling,\n resizeObserver,\n positioner,\n items,\n itemHeightEstimate,\n itemKey,\n overscanBy,\n render,\n onRender,\n });\n\n return (\n <div className={mx(classNames)} {...props} ref={ref}>\n {children}\n </div>\n );\n};\n\nconst MasonryRoot = forwardRef(MasonryRootImpl) as <Item>(\n props: MasonryRootProps<Item> & {\n ref?: Ref<HTMLDivElement | null>;\n },\n) => JSX.Element;\n\nexport const Masonry = {\n Root: MasonryRoot,\n};\n\nexport type { MasonryRootProps };\n"],
5
- "mappings": ";;;AAIA,SAASA,uBAAuB;AAChC,SAGEC,YACAC,eACAC,yBACK;AACP,OAAOC,SAKLC,YACAC,SACAC,cACK;AAEP,SAASC,aAAaC,eAAe;AACrC,SAA+BC,aAAa;AAC5C,SAASC,UAAU;AAsBnB,IAAMC,aAAa,CAACC,aAAAA;AAClB,QAAMC,UAAUC,MAAM,CAAA;AACtB,SAAOC,QAAQ,MAAA;AACb,WAAOC,OAAOC,YACZD,OAAOE,QAAQN,QAAAA,EACZO,OAAO,CAAC,CAACC,GAAGC,KAAAA,MAAWC,OAAOC,SAASF,KAAAA,CAAAA,EACvCG,IAAI,CAAC,CAACC,KAAKJ,KAAAA,MAAM;AAChB,aAAO;QAACI;QAAKJ,QAAQR;;IACvB,CAAA,CAAA;EAEN,GAAG;IAACD;IAAUC;GAAQ;AACxB;AAGA,IAAMa,kBAAkB,CACtB,EACEC,aACAC,gBACAC,cAAc,IACdC,iBAAiB,IACjBC,eAAe,GACfC,WACAC,OACAC,qBAAqB,KACrBC,SACAC,aAAa,GACbC,QACAC,UACAC,YACAC,iBACA,GAAGC,MAAAA,GAELC,iBAAAA;AAEA,QAAMC,UAAUC,OAA8B,IAAA;AAC9C,QAAMC,MAAMC,gBAAgBH,SAASD,YAAAA;AACrC,QAAM,EAAEK,OAAOC,OAAM,IAAKC,QAAQN,OAAAA;AAClC,QAAM,EAAEO,WAAWC,YAAW,IAAKC,YAAYT,OAAAA;AAC/C,QAAM/B,WAAWG,QACf,OAAO;IAAEc;IAAaC;IAAgBC;IAAcC;EAAU,IAC9D;IAACH;IAAaC;IAAgBC;IAAcC;GAAU;AAExD,QAAMqB,UAAU1C,WAAWC,QAAAA;AAC3B,QAAM0C,kBAAkBvC,QACtB,OAAO;IACLgC;IACApB;IACAC;IACA,GAAGyB;EACL,IACA;IAACN;IAAOM;IAAS1B;IAAaC;GAAe;AAE/C,QAAM2B,aAAaC,cAAcF,iBAAiB;IAACA;GAAgB;AACnE,QAAMG,iBAAiBC,kBAAkBH,UAAAA;AACzC,QAAMI,WAAWC,WAAW;IAC1BZ,QAAQR,kBAAkBqB,WAAWb;IACrCE;IACAC;IACAM;IACAF;IACAtB;IACAC;IACAC;IACAC;IACAC;IACAC;EACF,CAAA;AAEA,SACE,sBAAA,cAACwB,OAAAA;IAAIC,WAAWC,GAAGzB,UAAAA;IAAc,GAAGE;IAAOI;KACxCc,QAAAA;AAGP;AAEA,IAAMM,cAAcC,2BAAWxC,eAAAA;AAMxB,IAAMyC,UAAU;EACrBC,MAAMH;AACR;",
6
- "names": ["useComposedRefs", "useMasonry", "usePositioner", "useResizeObserver", "React", "forwardRef", "useMemo", "useRef", "useScroller", "useSize", "usePx", "mx", "usePxProps", "remProps", "remInPx", "usePx", "useMemo", "Object", "fromEntries", "entries", "filter", "_", "value", "Number", "isFinite", "map", "key", "MasonryRootImpl", "columnCount", "maxColumnCount", "columnWidth", "maxColumnWidth", "columnGutter", "rowGutter", "items", "itemHeightEstimate", "itemKey", "overscanBy", "render", "onRender", "classNames", "intrinsicHeight", "props", "forwardedRef", "rootRef", "useRef", "ref", "useComposedRefs", "width", "height", "useSize", "scrollTop", "isScrolling", "useScroller", "pxProps", "positionerProps", "positioner", "usePositioner", "resizeObserver", "useResizeObserver", "children", "useMasonry", "Infinity", "div", "className", "mx", "MasonryRoot", "forwardRef", "Masonry", "Root"]
4
+ "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { useComposedRefs } from '@radix-ui/react-compose-refs';\nimport { createContext } from '@radix-ui/react-context';\nimport { VirtuosoMasonry, type VirtuosoMasonryProps } from '@virtuoso.dev/masonry';\nimport React, { type ComponentType, type JSX, type PropsWithChildren, type Ref, useMemo, useRef } from 'react';\nimport { useResizeDetector } from 'react-resize-detector';\n\nimport { ScrollArea, usePx } from '@dxos/react-ui';\nimport { cardMaxInlineSize, cardMinInlineSize, composable, composableProps, scrollbar } from '@dxos/ui-theme';\n\n//\n// Context\n//\n\ntype MasonryContextValue = {\n /** Render component for each masonry item. */\n Tile: ComponentType<{ data: any; index: number }>;\n /** Override auto-calculated column count. */\n columns: number | undefined;\n /** Upper bound on number of columns. */\n maxColumns: number | undefined;\n /** Minimum column width in rem. */\n minColumnWidth: number;\n /** Maximum column width in rem. */\n maxColumnWidth: number;\n /** Space between columns and rows in rem. */\n gutter: number;\n};\n\nconst MASONRY_NAME = 'Masonry';\n\nconst [MasonryProvider, useMasonryContext] = createContext<MasonryContextValue>(MASONRY_NAME);\n\n//\n// Root\n//\n\ntype MasonryRootProps = PropsWithChildren<Partial<MasonryContextValue>>;\n\nconst MasonryRoot = ({\n children,\n Tile,\n columns = undefined,\n maxColumns = undefined,\n minColumnWidth = cardMinInlineSize,\n maxColumnWidth = cardMaxInlineSize,\n gutter = 0.75,\n}: MasonryRootProps) => (\n <MasonryProvider\n Tile={Tile!}\n columns={columns}\n maxColumns={maxColumns}\n minColumnWidth={minColumnWidth}\n maxColumnWidth={maxColumnWidth}\n gutter={gutter}\n >\n {children}\n </MasonryProvider>\n);\n\nMasonryRoot.displayName = 'Masonry.Root';\n\n//\n// Content\n//\n\ntype MasonryContentProps<Item> = {\n /** Items to render in the masonry grid. */\n items: Item[];\n /** Extract a stable key from an item, aligned with react-ui-mosaic's getId. */\n getId?: (data: Item) => string;\n};\n\nconst MasonryContentInner = composable<HTMLDivElement, MasonryContentProps<any>>(\n ({ items, getId, ...props }, forwardedRef) => {\n const rootRef = useRef<HTMLDivElement | null>(null);\n const composedRef = useComposedRefs(rootRef, forwardedRef);\n const { width = 0 } = useResizeDetector({ targetRef: rootRef });\n\n const { Tile, columns, maxColumns, minColumnWidth, maxColumnWidth, gutter } = useMasonryContext('Masonry.Content');\n const columnCount = useColumnCount(\n width - (scrollbar.thin.size + scrollbar.thin.padding),\n columns,\n maxColumns,\n minColumnWidth,\n maxColumnWidth,\n gutter,\n );\n\n const TileAdapter = useMemo(() => {\n const Adapter = ({ data, index }: { data: any; index: number }) => {\n return (\n <div role='listitem' style={{ paddingBottom: `${gutter}rem` }}>\n <Tile index={index} data={data} />\n </div>\n );\n };\n Adapter.displayName = 'Masonry.TileAdapter';\n return Adapter;\n }, [Tile, gutter]);\n\n // TODO(burdon): Masonry currently doesn't support an external scroller.\n // https://github.com/petyosi/react-virtuoso/issues/1305\n if (columns === 1) {\n return <VirtuosoMasonry data={items} columnCount={1} ItemContent={TileAdapter} useWindowScroll />;\n }\n\n return (\n <ScrollArea.Root {...composableProps(props, { classNames: 'w-' })} thin padding ref={composedRef}>\n <ScrollArea.Viewport asChild>\n {width > 0 && (\n <ComposableVirtuosoMasonry\n style={{ gap: `${gutter}rem` }}\n data={items}\n columnCount={columnCount}\n ItemContent={TileAdapter}\n />\n )}\n </ScrollArea.Viewport>\n </ScrollArea.Root>\n );\n },\n);\n\nconst ComposableVirtuosoMasonry = composable<HTMLDivElement, VirtuosoMasonryProps<any, any>>(({ ...props }) => {\n return <VirtuosoMasonry {...props} />;\n});\n\nMasonryContentInner.displayName = 'Masonry.Content';\n\nconst MasonryContent = MasonryContentInner as <Item>(\n props: MasonryContentProps<Item> & {\n ref?: Ref<HTMLDivElement | null>;\n },\n) => JSX.Element;\n\n/** Compute column count from container width and column constraints. */\nconst useColumnCount = (\n width: number,\n columns: number | undefined,\n maxColumns: number | undefined,\n minColumnWidth: number,\n maxColumnWidth: number,\n gutter: number,\n) => {\n const remInPx = usePx(1);\n return useMemo(() => {\n if (columns != null) {\n return columns;\n }\n\n const minColumnWidthPx = minColumnWidth * remInPx;\n const maxColumnWidthPx = maxColumnWidth * remInPx;\n const gutterPx = gutter * remInPx;\n\n if (width <= 0 || minColumnWidthPx <= 0) {\n return 1;\n }\n\n // Each tile has paddingRight: gutter, so every slot (including the last) occupies\n // (colWidth + gutterPx). The container therefore fits floor(containerWidth / (colWidth + gutterPx)) columns.\n let cols = Math.floor(width / (minColumnWidthPx + gutterPx));\n if (maxColumnWidthPx > 0) {\n const effectiveColWidth = width / cols - gutterPx;\n if (effectiveColWidth > maxColumnWidthPx) {\n // Try to add columns to keep cards below maxColumnWidth, but never violate minColumnWidth.\n const maxCols = Math.ceil(width / (maxColumnWidthPx + gutterPx));\n if (width / maxCols - gutterPx >= minColumnWidthPx) {\n cols = maxCols;\n }\n }\n }\n\n const clamped = maxColumns != null ? Math.min(cols, maxColumns) : cols;\n return Math.max(1, clamped);\n }, [remInPx, width, columns, maxColumns, minColumnWidth, maxColumnWidth, gutter]);\n};\n\n//\n// Masonry\n//\n\nexport const Masonry = {\n Root: MasonryRoot,\n Content: MasonryContent,\n};\n\nexport type { MasonryRootProps, MasonryContentProps };\n"],
5
+ "mappings": "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",
6
+ "names": ["useComposedRefs", "createContext", "VirtuosoMasonry", "React", "useMemo", "useRef", "useResizeDetector", "ScrollArea", "usePx", "cardMaxInlineSize", "cardMinInlineSize", "composable", "composableProps", "scrollbar", "MASONRY_NAME", "MasonryProvider", "useMasonryContext", "createContext", "MasonryRoot", "children", "Tile", "columns", "undefined", "maxColumns", "minColumnWidth", "cardMinInlineSize", "maxColumnWidth", "cardMaxInlineSize", "gutter", "displayName", "MasonryContentInner", "composable", "items", "getId", "props", "forwardedRef", "rootRef", "useRef", "composedRef", "useComposedRefs", "width", "useResizeDetector", "targetRef", "columnCount", "useColumnCount", "scrollbar", "thin", "size", "padding", "TileAdapter", "useMemo", "Adapter", "data", "index", "div", "role", "style", "paddingBottom", "VirtuosoMasonry", "ItemContent", "useWindowScroll", "ScrollArea", "Root", "composableProps", "classNames", "ref", "Viewport", "asChild", "ComposableVirtuosoMasonry", "gap", "MasonryContent", "remInPx", "usePx", "minColumnWidthPx", "maxColumnWidthPx", "gutterPx", "cols", "Math", "floor", "effectiveColWidth", "maxCols", "ceil", "clamped", "min", "max", "Masonry", "Content"]
7
7
  }
@@ -1 +1 @@
1
- {"inputs":{"src/Masonry.tsx":{"bytes":10108,"imports":[{"path":"@radix-ui/react-compose-refs","kind":"import-statement","external":true},{"path":"masonic","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/react-hooks","kind":"import-statement","external":true},{"path":"@dxos/react-ui","kind":"import-statement","external":true},{"path":"@dxos/react-ui-theme","kind":"import-statement","external":true}],"format":"esm"},"src/index.ts":{"bytes":454,"imports":[{"path":"src/Masonry.tsx","kind":"import-statement","original":"./Masonry"}],"format":"esm"}},"outputs":{"dist/lib/node-esm/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":5675},"dist/lib/node-esm/index.mjs":{"imports":[{"path":"@radix-ui/react-compose-refs","kind":"import-statement","external":true},{"path":"masonic","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/react-hooks","kind":"import-statement","external":true},{"path":"@dxos/react-ui","kind":"import-statement","external":true},{"path":"@dxos/react-ui-theme","kind":"import-statement","external":true}],"exports":["Masonry"],"entryPoint":"src/index.ts","inputs":{"src/Masonry.tsx":{"bytesInOutput":2126},"src/index.ts":{"bytesInOutput":0}},"bytes":2295}}}
1
+ {"inputs":{"src/Masonry.tsx":{"bytes":18020,"imports":[{"path":"@radix-ui/react-compose-refs","kind":"import-statement","external":true},{"path":"@radix-ui/react-context","kind":"import-statement","external":true},{"path":"@virtuoso.dev/masonry","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"react-resize-detector","kind":"import-statement","external":true},{"path":"@dxos/react-ui","kind":"import-statement","external":true},{"path":"@dxos/ui-theme","kind":"import-statement","external":true}],"format":"esm"},"src/index.ts":{"bytes":454,"imports":[{"path":"src/Masonry.tsx","kind":"import-statement","original":"./Masonry"}],"format":"esm"}},"outputs":{"dist/lib/node-esm/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":9670},"dist/lib/node-esm/index.mjs":{"imports":[{"path":"@radix-ui/react-compose-refs","kind":"import-statement","external":true},{"path":"@radix-ui/react-context","kind":"import-statement","external":true},{"path":"@virtuoso.dev/masonry","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"react-resize-detector","kind":"import-statement","external":true},{"path":"@dxos/react-ui","kind":"import-statement","external":true},{"path":"@dxos/ui-theme","kind":"import-statement","external":true}],"exports":["Masonry"],"entryPoint":"src/index.ts","inputs":{"src/Masonry.tsx":{"bytesInOutput":3876},"src/index.ts":{"bytesInOutput":0}},"bytes":4045}}}
@@ -1,13 +1,36 @@
1
- import { type UseMasonryOptions, type UsePositionerOptions } from 'masonic';
2
- import { type ComponentPropsWithRef, type JSX, type Ref } from 'react';
3
- import { type ThemedClassName } from '@dxos/react-ui';
4
- type MasonryRootProps<Item> = ThemedClassName<ComponentPropsWithRef<'div'>> & Omit<UsePositionerOptions, 'width'> & Omit<UseMasonryOptions<Item>, 'height' | 'scrollTop' | 'isScrolling' | 'resizeObserver' | 'positioner' | 'as' | 'id' | 'itemAs' | 'itemStyle' | 'className' | 'style' | 'role' | 'tabIndex' | 'containerRef'> & {
5
- intrinsicHeight?: boolean;
1
+ import { type ComponentType, type JSX, type PropsWithChildren, type Ref } from 'react';
2
+ type MasonryContextValue = {
3
+ /** Render component for each masonry item. */
4
+ Tile: ComponentType<{
5
+ data: any;
6
+ index: number;
7
+ }>;
8
+ /** Override auto-calculated column count. */
9
+ columns: number | undefined;
10
+ /** Upper bound on number of columns. */
11
+ maxColumns: number | undefined;
12
+ /** Minimum column width in rem. */
13
+ minColumnWidth: number;
14
+ /** Maximum column width in rem. */
15
+ maxColumnWidth: number;
16
+ /** Space between columns and rows in rem. */
17
+ gutter: number;
18
+ };
19
+ type MasonryRootProps = PropsWithChildren<Partial<MasonryContextValue>>;
20
+ type MasonryContentProps<Item> = {
21
+ /** Items to render in the masonry grid. */
22
+ items: Item[];
23
+ /** Extract a stable key from an item, aligned with react-ui-mosaic's getId. */
24
+ getId?: (data: Item) => string;
6
25
  };
7
26
  export declare const Masonry: {
8
- Root: <Item>(props: MasonryRootProps<Item> & {
27
+ Root: {
28
+ ({ children, Tile, columns, maxColumns, minColumnWidth, maxColumnWidth, gutter, }: MasonryRootProps): JSX.Element;
29
+ displayName: string;
30
+ };
31
+ Content: <Item>(props: MasonryContentProps<Item> & {
9
32
  ref?: Ref<HTMLDivElement | null>;
10
33
  }) => JSX.Element;
11
34
  };
12
- export type { MasonryRootProps };
35
+ export type { MasonryRootProps, MasonryContentProps };
13
36
  //# sourceMappingURL=Masonry.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"Masonry.d.ts","sourceRoot":"","sources":["../../../src/Masonry.tsx"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,oBAAoB,EAI1B,MAAM,SAAS,CAAC;AACjB,OAAc,EACZ,KAAK,qBAAqB,EAE1B,KAAK,GAAG,EACR,KAAK,GAAG,EAIT,MAAM,OAAO,CAAC;AAGf,OAAO,EAAE,KAAK,eAAe,EAAS,MAAM,gBAAgB,CAAC;AAG7D,KAAK,gBAAgB,CAAC,IAAI,IAAI,eAAe,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,GACzE,IAAI,CAAC,oBAAoB,EAAE,OAAO,CAAC,GACnC,IAAI,CACF,iBAAiB,CAAC,IAAI,CAAC,EACrB,QAAQ,GACR,WAAW,GACX,aAAa,GACb,gBAAgB,GAChB,YAAY,GACZ,IAAI,GACJ,IAAI,GACJ,QAAQ,GACR,WAAW,GACX,WAAW,GACX,OAAO,GACP,MAAM,GACN,UAAU,GACV,cAAc,CACjB,GAAG;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAmFpC,eAAO,MAAM,OAAO;WANgC,IAAI,SAC/C,gBAAgB,CAAC,IAAI,CAAC,GAAG;QAC9B,GAAG,CAAC,EAAE,GAAG,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;KAClC,KACE,GAAG,CAAC,OAAO;CAIf,CAAC;AAEF,YAAY,EAAE,gBAAgB,EAAE,CAAC"}
1
+ {"version":3,"file":"Masonry.d.ts","sourceRoot":"","sources":["../../../src/Masonry.tsx"],"names":[],"mappings":"AAOA,OAAc,EAAE,KAAK,aAAa,EAAE,KAAK,GAAG,EAAE,KAAK,iBAAiB,EAAE,KAAK,GAAG,EAAmB,MAAM,OAAO,CAAC;AAU/G,KAAK,mBAAmB,GAAG;IACzB,8CAA8C;IAC9C,IAAI,EAAE,aAAa,CAAC;QAAE,IAAI,EAAE,GAAG,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClD,6CAA6C;IAC7C,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,wCAAwC;IACxC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,mCAAmC;IACnC,cAAc,EAAE,MAAM,CAAC;IACvB,mCAAmC;IACnC,cAAc,EAAE,MAAM,CAAC;IACvB,6CAA6C;IAC7C,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAUF,KAAK,gBAAgB,GAAG,iBAAiB,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC;AA6BxE,KAAK,mBAAmB,CAAC,IAAI,IAAI;IAC/B,2CAA2C;IAC3C,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,+EAA+E;IAC/E,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC;CAChC,CAAC;AA+GF,eAAO,MAAM,OAAO;;2FAvIjB,gBAAgB;;;cAmF4B,IAAI,SAC1C,mBAAmB,CAAC,IAAI,CAAC,GAAG;QACjC,GAAG,CAAC,EAAE,GAAG,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;KAClC,KACE,GAAG,CAAC,OAAO;CAmDf,CAAC;AAEF,YAAY,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,CAAC"}
@@ -1,6 +1,10 @@
1
1
  import { type StoryObj } from '@storybook/react-vite';
2
+ import React from 'react';
3
+ import { MasonryRootProps } from './Masonry';
4
+ type DefaultStoryProps = MasonryRootProps;
2
5
  declare const meta: {
3
6
  title: string;
7
+ render: (props: DefaultStoryProps) => React.JSX.Element;
4
8
  decorators: import("@storybook/react").Decorator[];
5
9
  parameters: {
6
10
  layout: string;
@@ -9,4 +13,5 @@ declare const meta: {
9
13
  export default meta;
10
14
  type Story = StoryObj<typeof meta>;
11
15
  export declare const Default: Story;
16
+ export declare const Single: Story;
12
17
  //# sourceMappingURL=Masonry.stories.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"Masonry.stories.d.ts","sourceRoot":"","sources":["../../../src/Masonry.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAwCjE,QAAA,MAAM,IAAI;;;;;;CAiBsB,CAAC;AAEjC,eAAe,IAAI,CAAC;AAEpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC;AAEnC,eAAO,MAAM,OAAO,EAAE,KAErB,CAAC"}
1
+ {"version":3,"file":"Masonry.stories.d.ts","sourceRoot":"","sources":["../../../src/Masonry.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,MAAM,OAAO,CAAC;AAW1B,OAAO,EAAW,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAmBtD,KAAK,iBAAiB,GAAG,gBAAgB,CAAC;AAa1C,QAAA,MAAM,IAAI;;oBAXmB,iBAAiB;;;;;CA8B9B,CAAC;AAEjB,eAAe,IAAI,CAAC;AAEpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC;AAEnC,eAAO,MAAM,OAAO,EAAE,KAAU,CAAC;AAGjC,eAAO,MAAM,MAAM,EAAE,KAepB,CAAC"}