smarthr-ui 20.2.0 → 20.2.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.
Files changed (10) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/esm/components/Dialog/FocusTrap.js +2 -1
  3. package/esm/components/Dialog/FocusTrap.js.map +1 -1
  4. package/esm/components/Dialog/useDialogPortal.js +4 -7
  5. package/esm/components/Dialog/useDialogPortal.js.map +1 -1
  6. package/lib/components/Dialog/FocusTrap.js +2 -1
  7. package/lib/components/Dialog/FocusTrap.js.map +1 -1
  8. package/lib/components/Dialog/useDialogPortal.js +3 -6
  9. package/lib/components/Dialog/useDialogPortal.js.map +1 -1
  10. package/package.json +11 -11
package/CHANGELOG.md CHANGED
@@ -2,6 +2,14 @@
2
2
 
3
3
  All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
4
4
 
5
+ ### [20.2.1](https://github.com/kufu/smarthr-ui/compare/v20.2.0...v20.2.1) (2022-04-14)
6
+
7
+
8
+ ### Bug Fixes
9
+
10
+ * fix timing of appending portal ([#2424](https://github.com/kufu/smarthr-ui/issues/2424)) ([29cd62a](https://github.com/kufu/smarthr-ui/commit/29cd62afd113c840b81abeef3326e583c774ba61))
11
+ * ダイアログのフォーカストラップを抜けてしまう問題を修正 ([#2404](https://github.com/kufu/smarthr-ui/issues/2404)) ([91c3b90](https://github.com/kufu/smarthr-ui/commit/91c3b90721c33bbcb9d1a8d0d50561873cf4c356))
12
+
5
13
  ## [20.2.0](https://github.com/kufu/smarthr-ui/compare/v20.1.2...v20.2.0) (2022-04-12)
6
14
 
7
15
 
package/esm/components/Dialog/FocusTrap.js CHANGED
@@ -14,7 +14,8 @@ export const FocusTrap = ({ children }) => {
14
14
  const firstTabbale = tabbables[0];
15
15
  const lastTabbale = tabbables[tabbables.length - 1];
16
16
  const currentFocused = Array.from(tabbables).find((elm) => elm === e.target);
17
- if (e.shiftKey && currentFocused === firstTabbale) {
17
+ if (e.shiftKey &&
18
+ (currentFocused === firstTabbale || document.activeElement === focusTargetRef.current)) {
18
19
  lastTabbale.focus();
19
20
  e.preventDefault();
20
21
  }
package/esm/components/Dialog/FocusTrap.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"FocusTrap.js","sourceRoot":"","sources":["../../../src/components/Dialog/FocusTrap.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAkB,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAE7E,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAM9C,MAAM,CAAC,MAAM,SAAS,GAAe,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IACpD,MAAM,GAAG,GAAG,MAAM,CAAwB,IAAI,CAAC,CAAA;IAC/C,MAAM,cAAc,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAA;IAEnD,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,CAAgB,EAAE,EAAE;QACrD,IAAI,CAAC,CAAC,GAAG,KAAK,KAAK,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,EAAE;YAC3C,OAAM;SACP;QACD,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAA;QAC1E,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1B,OAAM;SACP;QACD,MAAM,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;QACjC,MAAM,WAAW,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QACnD,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,CAAA;QAC5E,IAAI,CAAC,CAAC,QAAQ,IAAI,cAAc,KAAK,YAAY,EAAE;YACjD,WAAW,CAAC,KAAK,EAAE,CAAA;YACnB,CAAC,CAAC,cAAc,EAAE,CAAA;SACnB;aAAM,IAAI,CAAC,CAAC,CAAC,QAAQ,IAAI,cAAc,KAAK,WAAW,EAAE;YACxD,YAAY,CAAC,KAAK,EAAE,CAAA;YACpB,CAAC,CAAC,cAAc,EAAE,CAAA;SACnB;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;QACjD,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;QACtD,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;IAEnB,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,cAAc,GAAG,QAAQ,CAAC,aAAa,CAAA;QAC7C,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,CAAA;QAE/B,OAAO,GAAG,EAAE;YACV,4BAA4B;YAC5B,IAAI,cAAc,YAAY,WAAW,EAAE;gBACzC,cAAc,CAAC,KAAK,EAAE,CAAA;aACvB;QACH,CAAC,CAAA;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,CACL,6BAAK,GAAG,EAAE,GAAG;QAEX,6BAAK,GAAG,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,CAAC,GAAI;QACzC,QAAQ,CACL,CACP,CAAA;AACH,CAAC,CAAA"}
1
+ {"version":3,"file":"FocusTrap.js","sourceRoot":"","sources":["../../../src/components/Dialog/FocusTrap.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAkB,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAE7E,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAM9C,MAAM,CAAC,MAAM,SAAS,GAAe,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IACpD,MAAM,GAAG,GAAG,MAAM,CAAwB,IAAI,CAAC,CAAA;IAC/C,MAAM,cAAc,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAA;IAEnD,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,CAAgB,EAAE,EAAE;QACrD,IAAI,CAAC,CAAC,GAAG,KAAK,KAAK,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,EAAE;YAC3C,OAAM;SACP;QACD,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAA;QAC1E,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1B,OAAM;SACP;QACD,MAAM,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;QACjC,MAAM,WAAW,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QACnD,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,CAAA;QAC5E,IACE,CAAC,CAAC,QAAQ;YACV,CAAC,cAAc,KAAK,YAAY,IAAI,QAAQ,CAAC,aAAa,KAAK,cAAc,CAAC,OAAO,CAAC,EACtF;YACA,WAAW,CAAC,KAAK,EAAE,CAAA;YACnB,CAAC,CAAC,cAAc,EAAE,CAAA;SACnB;aAAM,IAAI,CAAC,CAAC,CAAC,QAAQ,IAAI,cAAc,KAAK,WAAW,EAAE;YACxD,YAAY,CAAC,KAAK,EAAE,CAAA;YACpB,CAAC,CAAC,cAAc,EAAE,CAAA;SACnB;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;QACjD,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;QACtD,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;IAEnB,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,cAAc,GAAG,QAAQ,CAAC,aAAa,CAAA;QAC7C,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,CAAA;QAE/B,OAAO,GAAG,EAAE;YACV,4BAA4B;YAC5B,IAAI,cAAc,YAAY,WAAW,EAAE;gBACzC,cAAc,CAAC,KAAK,EAAE,CAAA;aACvB;QACH,CAAC,CAAA;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,CACL,6BAAK,GAAG,EAAE,GAAG;QAEX,6BAAK,GAAG,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,CAAC,GAAI;QACzC,QAAQ,CACL,CACP,CAAA;AACH,CAAC,CAAA"}
package/esm/components/Dialog/useDialogPortal.js CHANGED
@@ -1,17 +1,14 @@
1
- import { useCallback, useEffect, useRef, useState } from 'react';
1
+ import { useCallback, useLayoutEffect, useRef, useState } from 'react';
2
2
  import { createPortal } from 'react-dom';
3
3
  export function useDialogPortal(parent) {
4
4
  const portalContainer = useRef(document.createElement('div')).current;
5
5
  const [isReady, setIsReady] = useState(false);
6
- useEffect(() => {
6
+ useLayoutEffect(() => {
7
7
  const parentElement = parent != null && 'current' in parent ? parent.current : parent;
8
8
  // SSR を考慮し、useEffect 内で初期値 document.body を指定
9
9
  const actualParent = parentElement || document.body;
10
- // 前状態のクリンナップと同ループで処理しないようにタイミングを遅らせる
11
- setTimeout(() => {
12
- actualParent.appendChild(portalContainer);
13
- setIsReady(true);
14
- });
10
+ actualParent.appendChild(portalContainer);
11
+ setIsReady(true);
15
12
  return () => {
16
13
  setIsReady(false);
17
14
  actualParent.removeChild(portalContainer);
package/esm/components/Dialog/useDialogPortal.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useDialogPortal.js","sourceRoot":"","sources":["../../../src/components/Dialog/useDialogPortal.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA6B,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAExC,MAAM,UAAU,eAAe,CAAC,MAA6C;IAC3E,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAA;IACrE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAE7C,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,aAAa,GAAG,MAAM,IAAI,IAAI,IAAI,SAAS,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAA;QACrF,6CAA6C;QAC7C,MAAM,YAAY,GAAG,aAAa,IAAI,QAAQ,CAAC,IAAI,CAAA;QACnD,qCAAqC;QACrC,UAAU,CAAC,GAAG,EAAE;YACd,YAAY,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;YACzC,UAAU,CAAC,IAAI,CAAC,CAAA;QAClB,CAAC,CAAC,CAAA;QACF,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,KAAK,CAAC,CAAA;YACjB,YAAY,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;QAC3C,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAA;IAE7B,MAAM,MAAM,GAAiC,WAAW,CACtD,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;QACf,IAAI,CAAC,OAAO,EAAE;YACZ,wCAAwC;YACxC,OAAO,IAAI,CAAA;SACZ;QACD,OAAO,YAAY,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAA;IAChD,CAAC,EACD,CAAC,OAAO,EAAE,eAAe,CAAC,CAC3B,CAAA;IAED,OAAO;QACL,MAAM;QACN,OAAO;KACR,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"useDialogPortal.js","sourceRoot":"","sources":["../../../src/components/Dialog/useDialogPortal.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA6B,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AACjG,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAExC,MAAM,UAAU,eAAe,CAAC,MAA6C;IAC3E,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAA;IACrE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAE7C,eAAe,CAAC,GAAG,EAAE;QACnB,MAAM,aAAa,GAAG,MAAM,IAAI,IAAI,IAAI,SAAS,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAA;QACrF,6CAA6C;QAC7C,MAAM,YAAY,GAAG,aAAa,IAAI,QAAQ,CAAC,IAAI,CAAA;QACnD,YAAY,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;QACzC,UAAU,CAAC,IAAI,CAAC,CAAA;QAChB,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,KAAK,CAAC,CAAA;YACjB,YAAY,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;QAC3C,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAA;IAE7B,MAAM,MAAM,GAAiC,WAAW,CACtD,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;QACf,IAAI,CAAC,OAAO,EAAE;YACZ,wCAAwC;YACxC,OAAO,IAAI,CAAA;SACZ;QACD,OAAO,YAAY,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAA;IAChD,CAAC,EACD,CAAC,OAAO,EAAE,eAAe,CAAC,CAC3B,CAAA;IAED,OAAO;QACL,MAAM;QACN,OAAO;KACR,CAAA;AACH,CAAC"}
package/lib/components/Dialog/FocusTrap.js CHANGED
@@ -40,7 +40,8 @@ const FocusTrap = ({ children }) => {
40
40
  const firstTabbale = tabbables[0];
41
41
  const lastTabbale = tabbables[tabbables.length - 1];
42
42
  const currentFocused = Array.from(tabbables).find((elm) => elm === e.target);
43
- if (e.shiftKey && currentFocused === firstTabbale) {
43
+ if (e.shiftKey &&
44
+ (currentFocused === firstTabbale || document.activeElement === focusTargetRef.current)) {
44
45
  lastTabbale.focus();
45
46
  e.preventDefault();
46
47
  }
package/lib/components/Dialog/FocusTrap.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"FocusTrap.js","sourceRoot":"","sources":["../../../src/components/Dialog/FocusTrap.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA6E;AAE7E,kDAA8C;AAMvC,MAAM,SAAS,GAAe,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IACpD,MAAM,GAAG,GAAG,IAAA,cAAM,EAAwB,IAAI,CAAC,CAAA;IAC/C,MAAM,cAAc,GAAG,IAAA,cAAM,EAAiB,IAAI,CAAC,CAAA;IAEnD,MAAM,aAAa,GAAG,IAAA,mBAAW,EAAC,CAAC,CAAgB,EAAE,EAAE;QACrD,IAAI,CAAC,CAAC,GAAG,KAAK,KAAK,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,EAAE;YAC3C,OAAM;SACP;QACD,MAAM,SAAS,GAAG,IAAA,mBAAQ,EAAC,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAA;QAC1E,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1B,OAAM;SACP;QACD,MAAM,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;QACjC,MAAM,WAAW,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QACnD,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,CAAA;QAC5E,IAAI,CAAC,CAAC,QAAQ,IAAI,cAAc,KAAK,YAAY,EAAE;YACjD,WAAW,CAAC,KAAK,EAAE,CAAA;YACnB,CAAC,CAAC,cAAc,EAAE,CAAA;SACnB;aAAM,IAAI,CAAC,CAAC,CAAC,QAAQ,IAAI,cAAc,KAAK,WAAW,EAAE;YACxD,YAAY,CAAC,KAAK,EAAE,CAAA;YACpB,CAAC,CAAC,cAAc,EAAE,CAAA;SACnB;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;QACjD,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;QACtD,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;IAEnB,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,cAAc,GAAG,QAAQ,CAAC,aAAa,CAAA;QAC7C,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,CAAA;QAE/B,OAAO,GAAG,EAAE;YACV,4BAA4B;YAC5B,IAAI,cAAc,YAAY,WAAW,EAAE;gBACzC,cAAc,CAAC,KAAK,EAAE,CAAA;aACvB;QACH,CAAC,CAAA;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,CACL,uCAAK,GAAG,EAAE,GAAG;QAEX,uCAAK,GAAG,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,CAAC,GAAI;QACzC,QAAQ,CACL,CACP,CAAA;AACH,CAAC,CAAA;AAlDY,QAAA,SAAS,aAkDrB"}
1
+ {"version":3,"file":"FocusTrap.js","sourceRoot":"","sources":["../../../src/components/Dialog/FocusTrap.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA6E;AAE7E,kDAA8C;AAMvC,MAAM,SAAS,GAAe,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IACpD,MAAM,GAAG,GAAG,IAAA,cAAM,EAAwB,IAAI,CAAC,CAAA;IAC/C,MAAM,cAAc,GAAG,IAAA,cAAM,EAAiB,IAAI,CAAC,CAAA;IAEnD,MAAM,aAAa,GAAG,IAAA,mBAAW,EAAC,CAAC,CAAgB,EAAE,EAAE;QACrD,IAAI,CAAC,CAAC,GAAG,KAAK,KAAK,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,EAAE;YAC3C,OAAM;SACP;QACD,MAAM,SAAS,GAAG,IAAA,mBAAQ,EAAC,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAA;QAC1E,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1B,OAAM;SACP;QACD,MAAM,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;QACjC,MAAM,WAAW,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QACnD,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,CAAA;QAC5E,IACE,CAAC,CAAC,QAAQ;YACV,CAAC,cAAc,KAAK,YAAY,IAAI,QAAQ,CAAC,aAAa,KAAK,cAAc,CAAC,OAAO,CAAC,EACtF;YACA,WAAW,CAAC,KAAK,EAAE,CAAA;YACnB,CAAC,CAAC,cAAc,EAAE,CAAA;SACnB;aAAM,IAAI,CAAC,CAAC,CAAC,QAAQ,IAAI,cAAc,KAAK,WAAW,EAAE;YACxD,YAAY,CAAC,KAAK,EAAE,CAAA;YACpB,CAAC,CAAC,cAAc,EAAE,CAAA;SACnB;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;QACjD,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;QACtD,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;IAEnB,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,cAAc,GAAG,QAAQ,CAAC,aAAa,CAAA;QAC7C,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,CAAA;QAE/B,OAAO,GAAG,EAAE;YACV,4BAA4B;YAC5B,IAAI,cAAc,YAAY,WAAW,EAAE;gBACzC,cAAc,CAAC,KAAK,EAAE,CAAA;aACvB;QACH,CAAC,CAAA;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,CACL,uCAAK,GAAG,EAAE,GAAG;QAEX,uCAAK,GAAG,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,CAAC,GAAI;QACzC,QAAQ,CACL,CACP,CAAA;AACH,CAAC,CAAA;AArDY,QAAA,SAAS,aAqDrB"}
package/lib/components/Dialog/useDialogPortal.js CHANGED
@@ -6,15 +6,12 @@ const react_dom_1 = require("react-dom");
6
6
  function useDialogPortal(parent) {
7
7
  const portalContainer = (0, react_1.useRef)(document.createElement('div')).current;
8
8
  const [isReady, setIsReady] = (0, react_1.useState)(false);
9
- (0, react_1.useEffect)(() => {
9
+ (0, react_1.useLayoutEffect)(() => {
10
10
  const parentElement = parent != null && 'current' in parent ? parent.current : parent;
11
11
  // SSR を考慮し、useEffect 内で初期値 document.body を指定
12
12
  const actualParent = parentElement || document.body;
13
- // 前状態のクリンナップと同ループで処理しないようにタイミングを遅らせる
14
- setTimeout(() => {
15
- actualParent.appendChild(portalContainer);
16
- setIsReady(true);
17
- });
13
+ actualParent.appendChild(portalContainer);
14
+ setIsReady(true);
18
15
  return () => {
19
16
  setIsReady(false);
20
17
  actualParent.removeChild(portalContainer);
package/lib/components/Dialog/useDialogPortal.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useDialogPortal.js","sourceRoot":"","sources":["../../../src/components/Dialog/useDialogPortal.tsx"],"names":[],"mappings":";;;AAAA,iCAA2F;AAC3F,yCAAwC;AAExC,SAAgB,eAAe,CAAC,MAA6C;IAC3E,MAAM,eAAe,GAAG,IAAA,cAAM,EAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAA;IACrE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAA;IAE7C,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,aAAa,GAAG,MAAM,IAAI,IAAI,IAAI,SAAS,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAA;QACrF,6CAA6C;QAC7C,MAAM,YAAY,GAAG,aAAa,IAAI,QAAQ,CAAC,IAAI,CAAA;QACnD,qCAAqC;QACrC,UAAU,CAAC,GAAG,EAAE;YACd,YAAY,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;YACzC,UAAU,CAAC,IAAI,CAAC,CAAA;QAClB,CAAC,CAAC,CAAA;QACF,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,KAAK,CAAC,CAAA;YACjB,YAAY,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;QAC3C,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAA;IAE7B,MAAM,MAAM,GAAiC,IAAA,mBAAW,EACtD,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;QACf,IAAI,CAAC,OAAO,EAAE;YACZ,wCAAwC;YACxC,OAAO,IAAI,CAAA;SACZ;QACD,OAAO,IAAA,wBAAY,EAAC,QAAQ,EAAE,eAAe,CAAC,CAAA;IAChD,CAAC,EACD,CAAC,OAAO,EAAE,eAAe,CAAC,CAC3B,CAAA;IAED,OAAO;QACL,MAAM;QACN,OAAO;KACR,CAAA;AACH,CAAC;AAlCD,0CAkCC"}
1
+ {"version":3,"file":"useDialogPortal.js","sourceRoot":"","sources":["../../../src/components/Dialog/useDialogPortal.tsx"],"names":[],"mappings":";;;AAAA,iCAAiG;AACjG,yCAAwC;AAExC,SAAgB,eAAe,CAAC,MAA6C;IAC3E,MAAM,eAAe,GAAG,IAAA,cAAM,EAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAA;IACrE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAA;IAE7C,IAAA,uBAAe,EAAC,GAAG,EAAE;QACnB,MAAM,aAAa,GAAG,MAAM,IAAI,IAAI,IAAI,SAAS,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAA;QACrF,6CAA6C;QAC7C,MAAM,YAAY,GAAG,aAAa,IAAI,QAAQ,CAAC,IAAI,CAAA;QACnD,YAAY,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;QACzC,UAAU,CAAC,IAAI,CAAC,CAAA;QAChB,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,KAAK,CAAC,CAAA;YACjB,YAAY,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;QAC3C,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAA;IAE7B,MAAM,MAAM,GAAiC,IAAA,mBAAW,EACtD,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;QACf,IAAI,CAAC,OAAO,EAAE;YACZ,wCAAwC;YACxC,OAAO,IAAI,CAAA;SACZ;QACD,OAAO,IAAA,wBAAY,EAAC,QAAQ,EAAE,eAAe,CAAC,CAAA;IAChD,CAAC,EACD,CAAC,OAAO,EAAE,eAAe,CAAC,CAC3B,CAAA;IAED,OAAO;QACL,MAAM;QACN,OAAO;KACR,CAAA;AACH,CAAC;AA/BD,0CA+BC"}
package/package.json CHANGED
@@ -1,13 +1,13 @@
1
1
  {
2
2
  "name": "smarthr-ui",
3
3
  "description": "SmartHR ui components built with React.",
4
- "version": "20.2.0",
4
+ "version": "20.2.1",
5
5
  "author": "SmartHR-UI Team",
6
6
  "dependencies": {
7
7
  "dayjs": "^1.11.0",
8
8
  "lodash.merge": "^4.6.2",
9
9
  "lodash.range": "^3.2.0",
10
- "polished": "^4.1.4",
10
+ "polished": "^4.2.2",
11
11
  "react-draggable": "^4.4.4",
12
12
  "react-icons": "^4.3.1",
13
13
  "react-transition-group": "^4.4.2"
@@ -16,12 +16,12 @@
16
16
  "@babel/core": "^7.17.9",
17
17
  "@commitlint/cli": "^16.2.3",
18
18
  "@commitlint/config-conventional": "^16.2.1",
19
- "@storybook/addon-a11y": "^6.4.19",
20
- "@storybook/addon-essentials": "^6.4.19",
21
- "@storybook/addons": "^6.4.19",
22
- "@storybook/cli": "^6.4.19",
23
- "@storybook/react": "^6.4.19",
24
- "@storybook/theming": "^6.4.19",
19
+ "@storybook/addon-a11y": "^6.4.21",
20
+ "@storybook/addon-essentials": "^6.4.21",
21
+ "@storybook/addons": "^6.4.21",
22
+ "@storybook/cli": "^6.4.21",
23
+ "@storybook/react": "^6.4.21",
24
+ "@storybook/theming": "^6.4.21",
25
25
  "@swc/core": "^1.2.165",
26
26
  "@swc/jest": "^0.2.20",
27
27
  "@types/jest": "^27.4.1",
@@ -35,7 +35,7 @@
35
35
  "@types/styled-components": "^5.1.25",
36
36
  "babel-loader": "^8.2.4",
37
37
  "ecma-version-validator-webpack-plugin": "^1.2.1",
38
- "eslint": "^8.12.0",
38
+ "eslint": "^8.13.0",
39
39
  "eslint-config-smarthr": "^6.0.7",
40
40
  "fs-extra": "^10.0.1",
41
41
  "http-server": "^14.1.0",
@@ -67,13 +67,13 @@
67
67
  "stylelint-config-smarthr": "^1.0.2",
68
68
  "stylelint-config-standard": "^25.0.0",
69
69
  "stylelint-config-styled-components": "^0.1.1",
70
- "testcafe": "^1.18.4",
70
+ "testcafe": "^1.18.5",
71
71
  "ts-loader": "^9.2.8",
72
72
  "ts-node": "^10.7.0",
73
73
  "ttypescript": "^1.5.13",
74
74
  "typescript": "^4.6.3",
75
75
  "typescript-plugin-styled-components": "^2.0.0",
76
- "webpack": "^5.70.0"
76
+ "webpack": "^5.72.0"
77
77
  },
78
78
  "peerDependencies": {
79
79
  "react": "16.13.0 || ^17.0.1",