Skip to content

Commit

Permalink
fix: table not responding to parent size change (#1516)
Browse files Browse the repository at this point in the history
* fix: table not responding to parent size change

* chore: cleanup not used packages

* chore: cleanup more not used packages
  • Loading branch information
dmitrymatio authored Jun 15, 2023
1 parent 96a7eff commit 7d6bfb5
Show file tree
Hide file tree
Showing 4 changed files with 147 additions and 10 deletions.
2 changes: 2 additions & 0 deletions packages/gatsby-theme-aio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,15 @@
"redoc-cli": "^0.13.20",
"rehype-slug-custom-id": "^1.1.0",
"request": "^2.88.2",
"resize-observer-polyfill": "^1.5.1",
"sharp": "^0.31.0",
"stream-http": "^3.2.0",
"styled-components": "^5.3.5",
"swiper": "^8.3.2",
"to-arraybuffer": "^1.0.1",
"tty-browserify": "^0.0.1",
"unist-util-select": "3.0.4",
"use-debounce": "^9.0.4",
"uuid": "^9.0.0"
}
}
23 changes: 14 additions & 9 deletions packages/gatsby-theme-aio/src/components/Table/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,33 @@
* governing permissions and limitations under the License.
*/

import React, { useEffect, useRef, useState } from 'react';
import React, { useRef, useState } from 'react';
import { css } from '@emotion/react';
import PropTypes from 'prop-types';
import '@spectrum-css/table';
import { MOBILE_SCREEN_WIDTH } from '../../utils';
import { MOBILE_SCREEN_WIDTH, useParentSize } from '../../utils';

const Table = ({ children, css: cssOverrides, columnWidths, ...props }) => {
const [width, setWidth] = useState(MOBILE_SCREEN_WIDTH);
const tableRef = useRef(null);
const [width, setWidth] = useState(parseInt(MOBILE_SCREEN_WIDTH, 10));

useParentSize(tableRef, {
debounceDelay: 500,
initialValues: { width: parseInt(MOBILE_SCREEN_WIDTH, 10) },
callback: size => {
if (size.width) {
setWidth(size.width);
}
},
});

const columnWidthDistribution = columnWidths
? columnWidths
.split(',')
.map(num => (width * Number(num)) / 100)
.filter(width => !isNaN(width))
: [];

useEffect(() => {
if (tableRef.current.parentNode) {
setWidth(Number(tableRef.current.parentNode.offsetWidth));
}
}, [width]);

return (
<table
ref={tableRef}
Expand Down
114 changes: 113 additions & 1 deletion packages/gatsby-theme-aio/src/utils/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,17 @@
* governing permissions and limitations under the License.
*/

import React, { Children, cloneElement } from 'react';
import React, {
Children,
cloneElement,
useCallback,
useMemo,
useRef,
useState,
useLayoutEffect,
} from 'react';
import ResizeObserver from 'resize-observer-polyfill';
import { useDebouncedCallback } from 'use-debounce';
import { withPrefix } from 'gatsby';
import globals from '../../conf/globals';

Expand Down Expand Up @@ -265,6 +275,107 @@ const cloneChildren = (children, changeProps) => {
});
};

// Modified to actually grab the parent size https://github.com/dagda1/cuttingedge/blob/main/packages/use-get-parent-size/src/useParentSize/useParentSize.ts

const initialContentRect = {
bottom: undefined,
height: undefined,
left: undefined,
width: undefined,
right: undefined,
top: undefined,
x: undefined,
y: undefined,
};

const isNil = val => typeof val === 'undefined' || val === null;

const useParentSize = (
ref,
{
debounceDelay = 500,
initialValues = initialContentRect,
transformFunc = o => o,
maxDifference = 10,
callback = o => o,
}
) => {
const [contentRect, setContentRect] = useState({
...initialContentRect,
...initialValues,
});
const rerenderCount = useRef(0);
const previousContentRect = useRef(initialValues);

const transformer = useCallback(transformFunc, [transformFunc]);

if (!ref) console.error('You must pass a valid ref to useParentSize');

const debouncedCallback = useDebouncedCallback(
value => {
setContentRect(value);
callback(value);
},
debounceDelay,
{
leading: true,
}
);

const refElement = ref.current;

useLayoutEffect(() => {
if (isNil(refElement)) {
if (rerenderCount.current > 10) {
throw new Error('Maximum rerender count and no refElement Found');
}

setContentRect({ ...contentRect });
rerenderCount.current++;
return;
}

if (isNil(refElement.parentNode)) {
if (rerenderCount.parentNode > 10) {
throw new Error('Maximum rerender count and no parentNode Found');
}

setContentRect({ ...contentRect });
rerenderCount.parentNode++;
return;
}

const resizeObserver = new ResizeObserver(entries => {
if (!Array.isArray(entries) || entries.length !== 1) {
return;
}

const entry = entries[0];
const newWidth = Math.round(entry.contentRect.width);
const newHeight = Math.round(entry.contentRect.height);

const widthDiff = Math.abs(newWidth - (previousContentRect.current.width ?? 0));
const heightDiff = Math.abs(newHeight - (previousContentRect.current.height ?? 0));

if (widthDiff > maxDifference || heightDiff > maxDifference) {
previousContentRect.current.height = newHeight;
previousContentRect.current.width = newWidth;
debouncedCallback(entry.contentRect);
}
});

requestAnimationFrame(() => resizeObserver?.observe(refElement.parentNode));

return () => {
if (!!refElement.parentNode) {
resizeObserver?.unobserve(refElement.parentNode);
}
};
}, [maxDifference, debouncedCallback, refElement, initialValues, contentRect]);

return useMemo(() => transformer(contentRect), [contentRect, transformer]);
};

const DEFAULT_HOME = {
title: 'Products',
href: '/apis/',
Expand Down Expand Up @@ -303,6 +414,7 @@ export {
getExternalLinkProps,
getElementChild,
cloneChildren,
useParentSize,
DEFAULT_HOME,
SEARCH_PARAMS,
SIDENAV_WIDTH,
Expand Down
18 changes: 18 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,15 @@ __metadata:
redoc-cli: ^0.13.20
rehype-slug-custom-id: ^1.1.0
request: ^2.88.2
resize-observer-polyfill: ^1.5.1
sharp: ^0.31.0
stream-http: ^3.2.0
styled-components: ^5.3.5
swiper: ^8.3.2
to-arraybuffer: ^1.0.1
tty-browserify: ^0.0.1
unist-util-select: 3.0.4
use-debounce: ^9.0.4
uuid: ^9.0.0
peerDependencies:
gatsby: ^4.22.0
Expand Down Expand Up @@ -20737,6 +20739,13 @@ __metadata:
languageName: node
linkType: hard

"resize-observer-polyfill@npm:^1.5.1":
version: 1.5.1
resolution: "resize-observer-polyfill@npm:1.5.1"
checksum: 57e7f79489867b00ba43c9c051524a5c8f162a61d5547e99333549afc23e15c44fd43f2f318ea0261ea98c0eb3158cca261e6f48d66e1ed1cd1f340a43977094
languageName: node
linkType: hard

"resolve-alpn@npm:^1.0.0":
version: 1.2.1
resolution: "resolve-alpn@npm:1.2.1"
Expand Down Expand Up @@ -23809,6 +23818,15 @@ __metadata:
languageName: node
linkType: hard

"use-debounce@npm:^9.0.4":
version: 9.0.4
resolution: "use-debounce@npm:9.0.4"
peerDependencies:
react: ">=16.8.0"
checksum: 37da4ecbe4e10a6230580cac03a8cae1788ea3e417dfdd92fcf654325458cf1b4567fd57bebf888edab62701a6abe47059a585008fd04228784f223f94d66ce4
languageName: node
linkType: hard

"utif@npm:^2.0.1":
version: 2.0.1
resolution: "utif@npm:2.0.1"
Expand Down

0 comments on commit 7d6bfb5

Please sign in to comment.