@onesy/ui-react 1.0.144 → 1.0.146

package/TableCell/TableCell.js

@@ -129,7 +129,6 @@ const useStyle = (0, _styleReact.style)(theme => ({
 });
 const TableCell = /*#__PURE__*/_react.default.forwardRef((props_, ref) => {
   const theme = (0, _styleReact.useOnesyTheme)();
-  const windowWidth = (0, _useResize.default)();
   const l = theme.l;
   const props = _react.default.useMemo(() => {
     var _theme$ui, _theme$ui2;
@@ -181,13 +180,19 @@ const TableCell = /*#__PURE__*/_react.default.forwardRef((props_, ref) => {
   const {
     classes
   } = useStyle();
+  const windowWidth = (0, _useResize.default)();
   const [root, setRoot] = _react.default.useState();
   const [stickyActive, setStickyActive] = _react.default.useState(false);
   const [offset, setOffset] = _react.default.useState(0);
   const [sortedBy, setSortedBy] = _react.default.useState(sortedByDefault);
   const refs = {
-    root: _react.default.useRef(undefined)
+    root: _react.default.useRef(undefined),
+    offset: _react.default.useRef(null),
+    observer: _react.default.useRef(null),
+    sticky: _react.default.useRef(sticky)
   };
+  refs.root.current = root;
+  refs.sticky.current = sticky;
   const init = _react.default.useCallback(() => {
     setTimeout(() => {
       if (sticky) {
@@ -214,34 +219,67 @@ const TableCell = /*#__PURE__*/_react.default.forwardRef((props_, ref) => {
   _react.default.useEffect(() => {
     if (sortedBy !== sortedBy_) setSortedBy(sortedBy_);
   }, [sortedBy_]);
-  _react.default.useEffect(() => {
-    if (sticky) {
-      if (root) {
-        let offsetOriginal = root.offsetLeft;
-        const parentOverflow = window.document.querySelector('.onesy-Table-wrapper');
-        root.style.position = 'unset';
-        offsetOriginal = root.offsetLeft;
-        root.style.position = 'sticky';
-        const method = () => {
-          const offsetNew = root.offsetLeft;
-          setStickyActive(offsetOriginal !== offsetNew);
-        };
+  const onStickyMove = _react.default.useCallback(() => {
+    const offsetNew = refs.root.current.offsetLeft;
+    setStickyActive(refs.offset.current !== offsetNew);
+  }, []);
+  const onStickyInit = _react.default.useCallback(() => {
+    if (refs.sticky.current && refs.root.current) {
+      refs.root.current.style.position = 'unset';
+      refs.offset.current = refs.root.current.offsetLeft;
+      refs.root.current.style.position = 'sticky';
+      onStickyMove();
+    }
+  }, []);
+  const onObserve = _react.default.useCallback(() => {
+    var _refs$root$current2;
+    const element = (_refs$root$current2 = refs.root.current) === null || _refs$root$current2 === void 0 ? void 0 : _refs$root$current2.closest('table');
+
+    // clean up
+    if (refs.observer.current) refs.observer.current.disconnect();
+    if (!element) return;
 
-        // initial
-        method();
-        setTimeout(() => {
-          root.style.position = 'unset';
-          offsetOriginal = root.offsetLeft;
-          root.style.position = 'sticky';
-          method();
-        }, timeout);
-        if (parentOverflow) parentOverflow.addEventListener('scroll', method, {
-          passive: false
-        });
-        return () => {
-          if (parentOverflow) parentOverflow.removeEventListener('scroll', method);
-        };
+    // init
+    const config = {
+      childList: true,
+      subtree: true,
+      attributes: true,
+      attributeFilter: ['data-*'],
+      characterData: true
+    };
+    const method = mutations => {
+      for (const mutation of mutations) {
+        switch (mutation.type) {
+          case 'childList':
+          case 'attributes':
+          case 'characterData':
+            onStickyInit();
+            break;
+        }
       }
+    };
+    refs.observer.current = new MutationObserver(method);
+    refs.observer.current.observe(element, config);
+    return refs.observer.current;
+  }, []);
+  _react.default.useEffect(() => {
+    if (root && sticky) {
+      onStickyInit();
+      setTimeout(() => {
+        onStickyInit();
+      }, 250);
+
+      // observer
+      onObserve();
+
+      // scroll
+      const parentOverflow = window.document.querySelector('.onesy-Table-wrapper');
+      if (parentOverflow) parentOverflow.addEventListener('scroll', onStickyMove, {
+        passive: false
+      });
+      return () => {
+        if (parentOverflow) parentOverflow.removeEventListener('scroll', onStickyMove);
+      };
     }
   }, [timeout, windowWidth, sticky, stickyPosition, root]);
   const onSort = _react.default.useCallback(() => {

package/TableHead/TableHead.js

@@ -15,6 +15,7 @@ var _Surface = _interopRequireDefault(require("../Surface"));
 var _utils2 = require("../utils");
 var _TableRow = _interopRequireDefault(require("../TableRow"));
 var _LinearProgress = _interopRequireDefault(require("../LinearProgress"));
+var _useResize = _interopRequireDefault(require("../useResize"));
 const _excluded = ["tonal", "color", "size", "sticky", "stickyOffset", "timeout", "loading", "LinearGradientProps", "TableRowLoaderProps", "Component", "className", "style", "children"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -83,43 +84,82 @@ const TableHead = /*#__PURE__*/_react.default.forwardRef((props_, ref) => {
   const {
     classes
   } = useStyle();
+  const windowWidth = (0, _useResize.default)();
   const [root, setRoot] = _react.default.useState();
   const [stickyActive, setStickyActive] = _react.default.useState(false);
   const refs = {
-    root: _react.default.useRef(undefined)
+    root: _react.default.useRef(undefined),
+    offset: _react.default.useRef(null),
+    observer: _react.default.useRef(null),
+    sticky: _react.default.useRef(sticky)
   };
+  refs.root.current = root;
+  refs.sticky.current = sticky;
   const styleOther = {};
   if (sticky && stickyOffset !== undefined) styleOther.top = stickyOffset;
-  _react.default.useEffect(() => {
-    if (sticky) {
-      if (root) {
-        let offsetOriginal = root.offsetTop;
-        const parentOverflow = window.document.querySelector('.onesy-Table-wrapper');
-        root.style.position = 'unset';
-        offsetOriginal = root.offsetTop;
-        root.style.position = 'sticky';
-        const method = () => {
-          const offsetNew = root.offsetTop;
-          setStickyActive(offsetOriginal !== offsetNew);
-        };
+  const onStickyMove = _react.default.useCallback(() => {
+    const offsetNew = refs.root.current.offsetLeft;
+    setStickyActive(refs.offset.current !== offsetNew);
+  }, []);
+  const onStickyInit = _react.default.useCallback(() => {
+    if (refs.sticky.current && refs.root.current) {
+      refs.root.current.style.position = 'unset';
+      refs.offset.current = refs.root.current.offsetLeft;
+      refs.root.current.style.position = 'sticky';
+      onStickyMove();
+    }
+  }, []);
+  const onObserve = _react.default.useCallback(() => {
+    var _refs$root$current;
+    const element = (_refs$root$current = refs.root.current) === null || _refs$root$current === void 0 ? void 0 : _refs$root$current.closest('table');
+
+    // clean up
+    if (refs.observer.current) refs.observer.current.disconnect();
+    if (!element) return;
 
-        // initial
-        method();
-        setTimeout(() => {
-          root.style.position = 'unset';
-          offsetOriginal = root.offsetTop;
-          root.style.position = 'sticky';
-          method();
-        }, timeout);
-        if (parentOverflow) parentOverflow.addEventListener('scroll', method, {
-          passive: false
-        });
-        return () => {
-          if (parentOverflow) parentOverflow.removeEventListener('scroll', method);
-        };
+    // init
+    const config = {
+      childList: true,
+      subtree: true,
+      attributes: true,
+      attributeFilter: ['data-*'],
+      characterData: true
+    };
+    const method = mutations => {
+      for (const mutation of mutations) {
+        switch (mutation.type) {
+          case 'childList':
+          case 'attributes':
+          case 'characterData':
+            onStickyInit();
+            break;
+        }
       }
+    };
+    refs.observer.current = new MutationObserver(method);
+    refs.observer.current.observe(element, config);
+    return refs.observer.current;
+  }, []);
+  _react.default.useEffect(() => {
+    if (root && sticky) {
+      onStickyInit();
+      setTimeout(() => {
+        onStickyInit();
+      }, 250);
+
+      // observer
+      onObserve();
+
+      // scroll
+      const parentOverflow = window.document.querySelector('.onesy-Table-wrapper');
+      if (parentOverflow) parentOverflow.addEventListener('scroll', onStickyMove, {
+        passive: false
+      });
+      return () => {
+        if (parentOverflow) parentOverflow.removeEventListener('scroll', onStickyMove);
+      };
     }
-  }, [timeout, sticky, root]);
+  }, [timeout, windowWidth, sticky, root]);
   return /*#__PURE__*/_react.default.createElement(Surface, (0, _extends2.default)({
     ref: item => {
       if (ref) {

package/esm/TableCell/TableCell.js

@@ -122,7 +122,6 @@ const useStyle = styleMethod(theme => ({
 });
 const TableCell = /*#__PURE__*/React.forwardRef((props_, ref) => {
   const theme = useOnesyTheme();
-  const windowWidth = useResize();
   const l = theme.l;
   const props = React.useMemo(() => _objectSpread(_objectSpread(_objectSpread({}, theme?.ui?.elements?.all?.props?.default), theme?.ui?.elements?.onesyTableCell?.props?.default), props_), [props_]);
   const Line = React.useMemo(() => theme?.elements?.Line || LineElement, [theme]);
@@ -159,13 +158,19 @@ const TableCell = /*#__PURE__*/React.forwardRef((props_, ref) => {
   const {
     classes
   } = useStyle();
+  const windowWidth = useResize();
   const [root, setRoot] = React.useState();
   const [stickyActive, setStickyActive] = React.useState(false);
   const [offset, setOffset] = React.useState(0);
   const [sortedBy, setSortedBy] = React.useState(sortedByDefault);
   const refs = {
-    root: React.useRef(undefined)
+    root: React.useRef(undefined),
+    offset: React.useRef(null),
+    observer: React.useRef(null),
+    sticky: React.useRef(sticky)
   };
+  refs.root.current = root;
+  refs.sticky.current = sticky;
   const init = React.useCallback(() => {
     setTimeout(() => {
       if (sticky) {
@@ -191,34 +196,66 @@ const TableCell = /*#__PURE__*/React.forwardRef((props_, ref) => {
   React.useEffect(() => {
     if (sortedBy !== sortedBy_) setSortedBy(sortedBy_);
   }, [sortedBy_]);
-  React.useEffect(() => {
-    if (sticky) {
-      if (root) {
-        let offsetOriginal = root.offsetLeft;
-        const parentOverflow = window.document.querySelector('.onesy-Table-wrapper');
-        root.style.position = 'unset';
-        offsetOriginal = root.offsetLeft;
-        root.style.position = 'sticky';
-        const method = () => {
-          const offsetNew = root.offsetLeft;
-          setStickyActive(offsetOriginal !== offsetNew);
-        };
+  const onStickyMove = React.useCallback(() => {
+    const offsetNew = refs.root.current.offsetLeft;
+    setStickyActive(refs.offset.current !== offsetNew);
+  }, []);
+  const onStickyInit = React.useCallback(() => {
+    if (refs.sticky.current && refs.root.current) {
+      refs.root.current.style.position = 'unset';
+      refs.offset.current = refs.root.current.offsetLeft;
+      refs.root.current.style.position = 'sticky';
+      onStickyMove();
+    }
+  }, []);
+  const onObserve = React.useCallback(() => {
+    const element = refs.root.current?.closest('table');
+
+    // clean up
+    if (refs.observer.current) refs.observer.current.disconnect();
+    if (!element) return;
 
-        // initial
-        method();
-        setTimeout(() => {
-          root.style.position = 'unset';
-          offsetOriginal = root.offsetLeft;
-          root.style.position = 'sticky';
-          method();
-        }, timeout);
-        if (parentOverflow) parentOverflow.addEventListener('scroll', method, {
-          passive: false
-        });
-        return () => {
-          if (parentOverflow) parentOverflow.removeEventListener('scroll', method);
-        };
+    // init
+    const config = {
+      childList: true,
+      subtree: true,
+      attributes: true,
+      attributeFilter: ['data-*'],
+      characterData: true
+    };
+    const method = mutations => {
+      for (const mutation of mutations) {
+        switch (mutation.type) {
+          case 'childList':
+          case 'attributes':
+          case 'characterData':
+            onStickyInit();
+            break;
+        }
       }
+    };
+    refs.observer.current = new MutationObserver(method);
+    refs.observer.current.observe(element, config);
+    return refs.observer.current;
+  }, []);
+  React.useEffect(() => {
+    if (root && sticky) {
+      onStickyInit();
+      setTimeout(() => {
+        onStickyInit();
+      }, 250);
+
+      // observer
+      onObserve();
+
+      // scroll
+      const parentOverflow = window.document.querySelector('.onesy-Table-wrapper');
+      if (parentOverflow) parentOverflow.addEventListener('scroll', onStickyMove, {
+        passive: false
+      });
+      return () => {
+        if (parentOverflow) parentOverflow.removeEventListener('scroll', onStickyMove);
+      };
     }
   }, [timeout, windowWidth, sticky, stickyPosition, root]);
   const onSort = React.useCallback(() => {

package/esm/TableHead/TableHead.js

@@ -11,6 +11,7 @@ import SurfaceElement from '../Surface';
 import { staticClassName } from '../utils';
 import TableRowElement from '../TableRow';
 import LinearProgressElement from '../LinearProgress';
+import useResize from '../useResize';
 const useStyle = styleMethod(theme => ({
   root: {
     display: 'table-header-group',
@@ -64,43 +65,81 @@ const TableHead = /*#__PURE__*/React.forwardRef((props_, ref) => {
   const {
     classes
   } = useStyle();
+  const windowWidth = useResize();
   const [root, setRoot] = React.useState();
   const [stickyActive, setStickyActive] = React.useState(false);
   const refs = {
-    root: React.useRef(undefined)
+    root: React.useRef(undefined),
+    offset: React.useRef(null),
+    observer: React.useRef(null),
+    sticky: React.useRef(sticky)
   };
+  refs.root.current = root;
+  refs.sticky.current = sticky;
   const styleOther = {};
   if (sticky && stickyOffset !== undefined) styleOther.top = stickyOffset;
-  React.useEffect(() => {
-    if (sticky) {
-      if (root) {
-        let offsetOriginal = root.offsetTop;
-        const parentOverflow = window.document.querySelector('.onesy-Table-wrapper');
-        root.style.position = 'unset';
-        offsetOriginal = root.offsetTop;
-        root.style.position = 'sticky';
-        const method = () => {
-          const offsetNew = root.offsetTop;
-          setStickyActive(offsetOriginal !== offsetNew);
-        };
+  const onStickyMove = React.useCallback(() => {
+    const offsetNew = refs.root.current.offsetLeft;
+    setStickyActive(refs.offset.current !== offsetNew);
+  }, []);
+  const onStickyInit = React.useCallback(() => {
+    if (refs.sticky.current && refs.root.current) {
+      refs.root.current.style.position = 'unset';
+      refs.offset.current = refs.root.current.offsetLeft;
+      refs.root.current.style.position = 'sticky';
+      onStickyMove();
+    }
+  }, []);
+  const onObserve = React.useCallback(() => {
+    const element = refs.root.current?.closest('table');
+
+    // clean up
+    if (refs.observer.current) refs.observer.current.disconnect();
+    if (!element) return;
 
-        // initial
-        method();
-        setTimeout(() => {
-          root.style.position = 'unset';
-          offsetOriginal = root.offsetTop;
-          root.style.position = 'sticky';
-          method();
-        }, timeout);
-        if (parentOverflow) parentOverflow.addEventListener('scroll', method, {
-          passive: false
-        });
-        return () => {
-          if (parentOverflow) parentOverflow.removeEventListener('scroll', method);
-        };
+    // init
+    const config = {
+      childList: true,
+      subtree: true,
+      attributes: true,
+      attributeFilter: ['data-*'],
+      characterData: true
+    };
+    const method = mutations => {
+      for (const mutation of mutations) {
+        switch (mutation.type) {
+          case 'childList':
+          case 'attributes':
+          case 'characterData':
+            onStickyInit();
+            break;
+        }
       }
+    };
+    refs.observer.current = new MutationObserver(method);
+    refs.observer.current.observe(element, config);
+    return refs.observer.current;
+  }, []);
+  React.useEffect(() => {
+    if (root && sticky) {
+      onStickyInit();
+      setTimeout(() => {
+        onStickyInit();
+      }, 250);
+
+      // observer
+      onObserve();
+
+      // scroll
+      const parentOverflow = window.document.querySelector('.onesy-Table-wrapper');
+      if (parentOverflow) parentOverflow.addEventListener('scroll', onStickyMove, {
+        passive: false
+      });
+      return () => {
+        if (parentOverflow) parentOverflow.removeEventListener('scroll', onStickyMove);
+      };
     }
-  }, [timeout, sticky, root]);
+  }, [timeout, windowWidth, sticky, root]);
   return /*#__PURE__*/React.createElement(Surface, _extends({
     ref: item => {
       if (ref) {

package/esm/index.js

@@ -1,4 +1,4 @@
-/** @license UiReact v1.0.143
+/** @license UiReact v1.0.145
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/index.js

@@ -1,4 +1,4 @@
-/** @license UiReact v1.0.143
+/** @license UiReact v1.0.145
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onesy/ui-react",
-  "version": "1.0.144",
+  "version": "1.0.146",
   "description": "UI for React",
   "repository": "https://github.com/onesy-me/onesy.git",
   "author": "Lazar Erić <lazareric1@proton.me>",