@deephaven/components 1.28.0 → 1.28.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableViewWrapper.d.ts","sourceRoot":"","sources":["../../../src/spectrum/tableView/TableViewWrapper.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,uBAAuB,CAAC;AAU/B,OAAO,yBAAyB,CAAC;AAEjC,MAAM,WAAW,qBAAqB,CAAC,CAAC,CAAE,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IACrE,yEAAyE;IACzE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8DAA8D;IAC9D,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAClC,iEAAiE;IACjE,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACzD,+DAA+D;IAC/D,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAChC,KAAK,EAAE,qBAAqB,CAAC,CAAC,CAAC,GAC9B,GAAG,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"TableViewWrapper.d.ts","sourceRoot":"","sources":["../../../src/spectrum/tableView/TableViewWrapper.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,uBAAuB,CAAC;AAU/B,OAAO,yBAAyB,CAAC;AAEjC,MAAM,WAAW,qBAAqB,CAAC,CAAC,CAAE,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IACrE,yEAAyE;IACzE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8DAA8D;IAC9D,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAClC,iEAAiE;IACjE,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACzD,+DAA+D;IAC/D,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAChC,KAAK,EAAE,qBAAqB,CAAC,CAAC,CAAC,GAC9B,GAAG,CAAC,OAAO,CAsGb;AAED,eAAe,gBAAgB,CAAC"}
|
|
@@ -50,8 +50,12 @@ export function TableViewWrapper(props) {
|
|
|
50
50
|
if (onViewportChangeRef.current == null || rowHeight == null || rowHeight <= 0 || itemCount <= 0) {
|
|
51
51
|
return;
|
|
52
52
|
}
|
|
53
|
-
|
|
54
|
-
|
|
53
|
+
// Prefer the row height Spectrum actually laid out over the density/scale
|
|
54
|
+
// constant: at max scroll the constant under-estimates the true row
|
|
55
|
+
// height and collapses the reported range to the final row.
|
|
56
|
+
var effectiveRowHeight = element.scrollHeight > 0 ? element.scrollHeight / itemCount : rowHeight;
|
|
57
|
+
var top = Math.min(itemCount - 1, Math.max(0, Math.floor(element.scrollTop / effectiveRowHeight)));
|
|
58
|
+
var visibleRowCount = Math.max(1, Math.ceil(element.clientHeight / effectiveRowHeight));
|
|
55
59
|
var bottom = Math.max(top, Math.min(itemCount - 1, top + visibleRowCount));
|
|
56
60
|
var last = lastRangeRef.current;
|
|
57
61
|
if (last != null && last[0] === top && last[1] === bottom) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableViewWrapper.js","names":["TableView","SpectrumTableView","useCallback","useEffect","useRef","useState","extractSpectrumLastChildHTMLElement","useOnScrollRef","EMPTY_FUNCTION","cl","useSpectrumThemeProvider","jsx","_jsx","TableViewWrapper","props","_tableViewProps$densi","_props$itemCount","itemCount","_props$onScroll","onScroll","onViewportChange","rowHeight","UNSAFE_className","tableViewProps","_objectWithoutProperties","_excluded","_useSpectrumThemeProv","scale","_useState","_useState2","_slicedToArray","scrollElement","setScrollElement","onViewportChangeRef","current","lastRangeRef","updateViewport","element","top","Math","min","max","floor","scrollTop","visibleRowCount","ceil","clientHeight","bottom","last","handleScroll","event","target","scrollRef","tableViewRef","ref","undefined","resizeObserver","ResizeObserver","observe","disconnect","_objectSpread","concat","density"],"sources":["../../../src/spectrum/tableView/TableViewWrapper.tsx"],"sourcesContent":["import {\n TableView as SpectrumTableView,\n type SpectrumTableProps,\n} from '@adobe/react-spectrum';\nimport { useCallback, useEffect, useRef, useState } from 'react';\nimport type { DOMRefValue } from '@react-types/shared';\nimport {\n extractSpectrumLastChildHTMLElement,\n useOnScrollRef,\n} from '@deephaven/react-hooks';\nimport { EMPTY_FUNCTION } from '@deephaven/utils';\nimport cl from 'classnames';\nimport { useSpectrumThemeProvider } from '../../theme';\nimport './TableViewWrapper.scss';\n\nexport interface TableViewWrapperProps<T> extends SpectrumTableProps<T> {\n /** Total number of logical rows represented by a windowed collection. */\n itemCount?: number;\n /** Handler that is called when the table body is scrolled. */\n onScroll?: (event: Event) => void;\n /** Handler that is called when the visible row range changes. */\n onViewportChange?: (top: number, bottom: number) => void;\n /** Fixed row height used to calculate the visible viewport. */\n rowHeight?: number;\n}\n\n/**\n * Wraps a Spectrum TableView with consistent sizing and scroll handling.\n * Table data wrappers can provide windowed items while sharing the same\n * Spectrum integration.\n */\nexport function TableViewWrapper<T>(\n props: TableViewWrapperProps<T>\n): JSX.Element {\n const {\n itemCount = 0,\n onScroll = EMPTY_FUNCTION,\n onViewportChange,\n rowHeight,\n UNSAFE_className,\n ...tableViewProps\n } = props;\n const { scale } = useSpectrumThemeProvider();\n const [scrollElement, setScrollElement] = useState<HTMLElement | null>(null);\n\n // Ref so callback identity changes don't retrigger updateViewport or the effect\n const onViewportChangeRef = useRef(onViewportChange);\n onViewportChangeRef.current = onViewportChange;\n const lastRangeRef = useRef<readonly [number, number] | null>(null);\n\n const updateViewport = useCallback(\n (element: HTMLElement) => {\n if (\n onViewportChangeRef.current == null ||\n rowHeight == null ||\n rowHeight <= 0 ||\n itemCount <= 0\n ) {\n return;\n }\n const top = Math.min(\n itemCount - 1,\n Math.max(0, Math.floor(element.scrollTop /
|
|
1
|
+
{"version":3,"file":"TableViewWrapper.js","names":["TableView","SpectrumTableView","useCallback","useEffect","useRef","useState","extractSpectrumLastChildHTMLElement","useOnScrollRef","EMPTY_FUNCTION","cl","useSpectrumThemeProvider","jsx","_jsx","TableViewWrapper","props","_tableViewProps$densi","_props$itemCount","itemCount","_props$onScroll","onScroll","onViewportChange","rowHeight","UNSAFE_className","tableViewProps","_objectWithoutProperties","_excluded","_useSpectrumThemeProv","scale","_useState","_useState2","_slicedToArray","scrollElement","setScrollElement","onViewportChangeRef","current","lastRangeRef","updateViewport","element","effectiveRowHeight","scrollHeight","top","Math","min","max","floor","scrollTop","visibleRowCount","ceil","clientHeight","bottom","last","handleScroll","event","target","scrollRef","tableViewRef","ref","undefined","resizeObserver","ResizeObserver","observe","disconnect","_objectSpread","concat","density"],"sources":["../../../src/spectrum/tableView/TableViewWrapper.tsx"],"sourcesContent":["import {\n TableView as SpectrumTableView,\n type SpectrumTableProps,\n} from '@adobe/react-spectrum';\nimport { useCallback, useEffect, useRef, useState } from 'react';\nimport type { DOMRefValue } from '@react-types/shared';\nimport {\n extractSpectrumLastChildHTMLElement,\n useOnScrollRef,\n} from '@deephaven/react-hooks';\nimport { EMPTY_FUNCTION } from '@deephaven/utils';\nimport cl from 'classnames';\nimport { useSpectrumThemeProvider } from '../../theme';\nimport './TableViewWrapper.scss';\n\nexport interface TableViewWrapperProps<T> extends SpectrumTableProps<T> {\n /** Total number of logical rows represented by a windowed collection. */\n itemCount?: number;\n /** Handler that is called when the table body is scrolled. */\n onScroll?: (event: Event) => void;\n /** Handler that is called when the visible row range changes. */\n onViewportChange?: (top: number, bottom: number) => void;\n /** Fixed row height used to calculate the visible viewport. */\n rowHeight?: number;\n}\n\n/**\n * Wraps a Spectrum TableView with consistent sizing and scroll handling.\n * Table data wrappers can provide windowed items while sharing the same\n * Spectrum integration.\n */\nexport function TableViewWrapper<T>(\n props: TableViewWrapperProps<T>\n): JSX.Element {\n const {\n itemCount = 0,\n onScroll = EMPTY_FUNCTION,\n onViewportChange,\n rowHeight,\n UNSAFE_className,\n ...tableViewProps\n } = props;\n const { scale } = useSpectrumThemeProvider();\n const [scrollElement, setScrollElement] = useState<HTMLElement | null>(null);\n\n // Ref so callback identity changes don't retrigger updateViewport or the effect\n const onViewportChangeRef = useRef(onViewportChange);\n onViewportChangeRef.current = onViewportChange;\n const lastRangeRef = useRef<readonly [number, number] | null>(null);\n\n const updateViewport = useCallback(\n (element: HTMLElement) => {\n if (\n onViewportChangeRef.current == null ||\n rowHeight == null ||\n rowHeight <= 0 ||\n itemCount <= 0\n ) {\n return;\n }\n // Prefer the row height Spectrum actually laid out over the density/scale\n // constant: at max scroll the constant under-estimates the true row\n // height and collapses the reported range to the final row.\n const effectiveRowHeight =\n element.scrollHeight > 0 ? element.scrollHeight / itemCount : rowHeight;\n const top = Math.min(\n itemCount - 1,\n Math.max(0, Math.floor(element.scrollTop / effectiveRowHeight))\n );\n const visibleRowCount = Math.max(\n 1,\n Math.ceil(element.clientHeight / effectiveRowHeight)\n );\n const bottom = Math.max(\n top,\n Math.min(itemCount - 1, top + visibleRowCount)\n );\n const last = lastRangeRef.current;\n if (last != null && last[0] === top && last[1] === bottom) {\n return;\n }\n lastRangeRef.current = [top, bottom];\n onViewportChangeRef.current(top, bottom);\n },\n [itemCount, rowHeight]\n );\n\n const handleScroll = useCallback(\n (event: Event) => {\n onScroll(event);\n updateViewport(event.target as HTMLElement);\n },\n [onScroll, updateViewport]\n );\n\n const scrollRef = useOnScrollRef(\n handleScroll,\n extractSpectrumLastChildHTMLElement\n );\n const tableViewRef = useCallback(\n (ref: DOMRefValue<HTMLDivElement> | null) => {\n scrollRef(ref);\n setScrollElement(extractSpectrumLastChildHTMLElement(ref));\n },\n [scrollRef]\n );\n\n useEffect(() => {\n if (scrollElement == null) {\n return undefined;\n }\n lastRangeRef.current = null;\n updateViewport(scrollElement);\n const resizeObserver = new ResizeObserver(() => {\n updateViewport(scrollElement);\n });\n resizeObserver.observe(scrollElement);\n return () => {\n resizeObserver.disconnect();\n };\n }, [scrollElement, updateViewport]);\n\n return (\n <SpectrumTableView\n ref={tableViewRef}\n // eslint-disable-next-line react/jsx-props-no-spreading\n {...tableViewProps}\n UNSAFE_className={cl(\n 'dh-table-view-wrapper',\n `dh-table-view-wrapper-density-${tableViewProps.density ?? 'regular'}`,\n `dh-table-view-wrapper-scale-${scale}`,\n UNSAFE_className\n )}\n />\n );\n}\n\nexport default TableViewWrapper;\n"],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@deephaven/components",
|
|
3
|
-
"version": "1.28.
|
|
3
|
+
"version": "1.28.1",
|
|
4
4
|
"description": "Deephaven React component library",
|
|
5
5
|
"author": "Deephaven Data Labs LLC",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -86,5 +86,5 @@
|
|
|
86
86
|
"publishConfig": {
|
|
87
87
|
"access": "public"
|
|
88
88
|
},
|
|
89
|
-
"gitHead": "
|
|
89
|
+
"gitHead": "38cf064150db72681de850cb5b1350755ac9bb5e"
|
|
90
90
|
}
|