smarthr-ui 19.0.0 → 19.1.0
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.
- package/CHANGELOG.md +31 -0
- package/esm/components/AppNavi/AppNavi.js +3 -1
- package/esm/components/AppNavi/AppNavi.js.map +1 -1
- package/esm/components/AppNavi/AppNaviButton.js +2 -1
- package/esm/components/AppNavi/AppNaviButton.js.map +1 -1
- package/esm/components/AppNavi/AppNaviDropdown.js +4 -1
- package/esm/components/AppNavi/AppNaviDropdown.js.map +1 -1
- package/esm/components/AppNavi/appNaviHelper.js +3 -0
- package/esm/components/AppNavi/appNaviHelper.js.map +1 -1
- package/esm/components/BottomFixedArea/BottomFixedArea.js +14 -45
- package/esm/components/BottomFixedArea/BottomFixedArea.js.map +1 -1
- package/esm/components/ComboBox/MultiComboBox.d.ts +6 -6
- package/esm/components/ComboBox/MultiComboBox.js +3 -3
- package/esm/components/ComboBox/MultiComboBox.js.map +1 -1
- package/esm/components/ComboBox/MultiSelectedItemInner.d.ts +3 -3
- package/esm/components/ComboBox/SingleComboBox.d.ts +5 -5
- package/esm/components/ComboBox/types.d.ts +1 -1
- package/esm/components/ComboBox/useListBox.d.ts +3 -3
- package/esm/components/ComboBox/useListBox.js +52 -25
- package/esm/components/ComboBox/useListBox.js.map +1 -1
- package/esm/components/Dialog/ModelessDialog.js +3 -3
- package/esm/components/Dialog/ModelessDialog.js.map +1 -1
- package/esm/components/Dialog/useClassNames.d.ts +1 -0
- package/esm/components/Dialog/useClassNames.js +1 -0
- package/esm/components/Dialog/useClassNames.js.map +1 -1
- package/esm/components/FormGroup/FormGroup.d.ts +1 -1
- package/esm/components/InformationPanel/InformationPanel.d.ts +1 -1
- package/esm/components/InformationPanel/InformationPanel.js +34 -27
- package/esm/components/InformationPanel/InformationPanel.js.map +1 -1
- package/esm/components/InputFile/InputFile.d.ts +8 -0
- package/esm/components/InputFile/InputFile.js.map +1 -1
- package/esm/components/Layout/Cluster/Cluster.js +8 -0
- package/esm/components/Layout/Cluster/Cluster.js.map +1 -1
- package/esm/components/Layout/LineUp/LineUp.js +7 -17
- package/esm/components/Layout/LineUp/LineUp.js.map +1 -1
- package/esm/components/Layout/Sidebar/Sidebar.js +8 -0
- package/esm/components/Layout/Sidebar/Sidebar.js.map +1 -1
- package/esm/components/LineClamp/LineClamp.d.ts +3 -0
- package/esm/components/LineClamp/LineClamp.js.map +1 -1
- package/esm/components/Loader/Loader.d.ts +3 -0
- package/esm/components/Loader/Loader.js.map +1 -1
- package/esm/components/Pagination/Pagination.d.ts +8 -2
- package/esm/components/Pagination/Pagination.js.map +1 -1
- package/esm/components/RadioButton/RadioButton.d.ts +4 -2
- package/esm/components/RadioButton/RadioButton.js.map +1 -1
- package/esm/components/Tooltip/Tooltip.js +2 -2
- package/esm/components/Tooltip/Tooltip.js.map +1 -1
- package/lib/components/AppNavi/AppNavi.js +3 -1
- package/lib/components/AppNavi/AppNavi.js.map +1 -1
- package/lib/components/AppNavi/AppNaviButton.js +2 -1
- package/lib/components/AppNavi/AppNaviButton.js.map +1 -1
- package/lib/components/AppNavi/AppNaviDropdown.js +4 -1
- package/lib/components/AppNavi/AppNaviDropdown.js.map +1 -1
- package/lib/components/AppNavi/appNaviHelper.js +3 -0
- package/lib/components/AppNavi/appNaviHelper.js.map +1 -1
- package/lib/components/BottomFixedArea/BottomFixedArea.js +14 -45
- package/lib/components/BottomFixedArea/BottomFixedArea.js.map +1 -1
- package/lib/components/ComboBox/MultiComboBox.d.ts +6 -6
- package/lib/components/ComboBox/MultiComboBox.js +3 -3
- package/lib/components/ComboBox/MultiComboBox.js.map +1 -1
- package/lib/components/ComboBox/MultiSelectedItemInner.d.ts +3 -3
- package/lib/components/ComboBox/SingleComboBox.d.ts +5 -5
- package/lib/components/ComboBox/types.d.ts +1 -1
- package/lib/components/ComboBox/useListBox.d.ts +3 -3
- package/lib/components/ComboBox/useListBox.js +52 -25
- package/lib/components/ComboBox/useListBox.js.map +1 -1
- package/lib/components/Dialog/ModelessDialog.js +3 -3
- package/lib/components/Dialog/ModelessDialog.js.map +1 -1
- package/lib/components/Dialog/useClassNames.d.ts +1 -0
- package/lib/components/Dialog/useClassNames.js +1 -0
- package/lib/components/Dialog/useClassNames.js.map +1 -1
- package/lib/components/FormGroup/FormGroup.d.ts +1 -1
- package/lib/components/InformationPanel/InformationPanel.d.ts +1 -1
- package/lib/components/InformationPanel/InformationPanel.js +33 -26
- package/lib/components/InformationPanel/InformationPanel.js.map +1 -1
- package/lib/components/InputFile/InputFile.d.ts +8 -0
- package/lib/components/InputFile/InputFile.js.map +1 -1
- package/lib/components/Layout/Cluster/Cluster.js +8 -0
- package/lib/components/Layout/Cluster/Cluster.js.map +1 -1
- package/lib/components/Layout/LineUp/LineUp.js +7 -17
- package/lib/components/Layout/LineUp/LineUp.js.map +1 -1
- package/lib/components/Layout/Sidebar/Sidebar.js +8 -0
- package/lib/components/Layout/Sidebar/Sidebar.js.map +1 -1
- package/lib/components/LineClamp/LineClamp.d.ts +3 -0
- package/lib/components/LineClamp/LineClamp.js.map +1 -1
- package/lib/components/Loader/Loader.d.ts +3 -0
- package/lib/components/Loader/Loader.js.map +1 -1
- package/lib/components/Pagination/Pagination.d.ts +8 -2
- package/lib/components/Pagination/Pagination.js.map +1 -1
- package/lib/components/RadioButton/RadioButton.d.ts +4 -2
- package/lib/components/RadioButton/RadioButton.js.map +1 -1
- package/lib/components/Tooltip/Tooltip.js +2 -2
- package/lib/components/Tooltip/Tooltip.js.map +1 -1
- package/package.json +14 -14
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,37 @@
|
|
|
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
|
+
## [19.1.0](https://github.com/kufu/smarthr-ui/compare/v19.0.2...v19.1.0) (2022-03-03)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
* change to ReactNode for i18n ([#2321](https://github.com/kufu/smarthr-ui/issues/2321)) ([773e522](https://github.com/kufu/smarthr-ui/commit/773e5228c9c5d25ca80f66ea4eb1002b59cd7f24))
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
### Bug Fixes
|
|
14
|
+
|
|
15
|
+
* InformationPanel の内部処理を memo 化 ([#2315](https://github.com/kufu/smarthr-ui/issues/2315)) ([3255546](https://github.com/kufu/smarthr-ui/commit/3255546c2971cf6030728d9fe287d561f7e18c29))
|
|
16
|
+
|
|
17
|
+
### [19.0.2](https://github.com/kufu/smarthr-ui/compare/v19.0.1...v19.0.2) (2022-02-28)
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
### Bug Fixes
|
|
21
|
+
|
|
22
|
+
* `BottomFixedArea` のモバイル表示調整 ([#2285](https://github.com/kufu/smarthr-ui/issues/2285)) ([ff5989c](https://github.com/kufu/smarthr-ui/commit/ff5989c4e59a638f23d952622a6a59559d5d6ac5))
|
|
23
|
+
* ComboBoxItem を Storybook や SmartHR Design System での Props 表示のために、よりわかりやすい名前に変える ([#2299](https://github.com/kufu/smarthr-ui/issues/2299)) ([b715b60](https://github.com/kufu/smarthr-ui/commit/b715b600e939539ac76202adf401252b24379694))
|
|
24
|
+
* workaround empty flex gap bug ([#2298](https://github.com/kufu/smarthr-ui/issues/2298)) ([0bb4ff5](https://github.com/kufu/smarthr-ui/commit/0bb4ff562859bb9776870a8f31e32999fd97a45c))
|
|
25
|
+
|
|
26
|
+
### [19.0.1](https://github.com/kufu/smarthr-ui/compare/v19.0.0...v19.0.1) (2022-02-22)
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
### Bug Fixes
|
|
30
|
+
|
|
31
|
+
* `AppNavi` のアイテムのテキストが折り返されないように修正 ([#2283](https://github.com/kufu/smarthr-ui/issues/2283)) ([a58b2ac](https://github.com/kufu/smarthr-ui/commit/a58b2ac0c66d778cb631f6c4cdc79aa643218e03))
|
|
32
|
+
* disabled なボタンに表示するツールチップが正常に動作するように修正 (SHRUI-529) ([#2280](https://github.com/kufu/smarthr-ui/issues/2280)) ([7bdbfb2](https://github.com/kufu/smarthr-ui/commit/7bdbfb2f58f6d47e03717ed9c5549ab42109a891))
|
|
33
|
+
* fix ModelessDialog to be able to close on mobile ([#2279](https://github.com/kufu/smarthr-ui/issues/2279)) ([0f89dba](https://github.com/kufu/smarthr-ui/commit/0f89dba82328db0ff2bcc50d2f84e3a525163fa4))
|
|
34
|
+
* コンボボックスのドロップダウンに表示するオプション数を段階的に増やすように変更 (SHRUI-540) ([#2263](https://github.com/kufu/smarthr-ui/issues/2263)) ([33251bf](https://github.com/kufu/smarthr-ui/commit/33251bf20bda02981a5fa1f56fc95e65594f4d09))
|
|
35
|
+
|
|
5
36
|
## [19.0.0](https://github.com/kufu/smarthr-ui/compare/v18.0.0...v19.0.0) (2022-02-17)
|
|
6
37
|
|
|
7
38
|
|
|
@@ -37,6 +37,7 @@ const Wrapper = styled.nav `
|
|
|
37
37
|
return css `
|
|
38
38
|
display: flex;
|
|
39
39
|
align-items: center;
|
|
40
|
+
min-width: max-content;
|
|
40
41
|
box-shadow: ${shadow.LAYER1};
|
|
41
42
|
background-color: ${color.WHITE};
|
|
42
43
|
padding-right: ${spacingByChar(1.5)};
|
|
@@ -54,8 +55,9 @@ const StatusLabel = styled(StatusLabelComponent) `
|
|
|
54
55
|
const Buttons = styled.ul `
|
|
55
56
|
${({ themes: { spacingByChar } }) => {
|
|
56
57
|
return css `
|
|
58
|
+
align-self: stretch;
|
|
57
59
|
display: flex;
|
|
58
|
-
align-items:
|
|
60
|
+
align-items: stretch;
|
|
59
61
|
gap: ${spacingByChar(1)};
|
|
60
62
|
margin: 0;
|
|
61
63
|
padding: 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppNavi.js","sourceRoot":"","sources":["../../../src/components/AppNavi/AppNavi.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AppNavi.js","sourceRoot":"","sources":["../../../src/components/AppNavi/AppNavi.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import styled from 'styled-components';
|
|
|
3
3
|
import { useTheme } from '../../hooks/useTheme';
|
|
4
4
|
import { getIconComponent, getItemStyle } from './appNaviHelper';
|
|
5
5
|
import { useClassNames } from './useClassNames';
|
|
6
|
+
import { UnstyledButton } from '../Button';
|
|
6
7
|
export const AppNaviButton = ({ children, icon, current = false, isUnclickable = false, onClick, }) => {
|
|
7
8
|
const theme = useTheme();
|
|
8
9
|
const classNames = useClassNames();
|
|
@@ -11,5 +12,5 @@ export const AppNaviButton = ({ children, icon, current = false, isUnclickable =
|
|
|
11
12
|
iconComponent,
|
|
12
13
|
children));
|
|
13
14
|
};
|
|
14
|
-
const Button = styled
|
|
15
|
+
const Button = styled(UnstyledButton)((props) => getItemStyle(props));
|
|
15
16
|
//# sourceMappingURL=AppNaviButton.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppNaviButton.js","sourceRoot":"","sources":["../../../src/components/AppNavi/AppNaviButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyB,MAAM,OAAO,CAAA;AAC7C,OAAO,MAAM,MAAM,mBAAmB,CAAA;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAE/C,OAAO,EAAkB,gBAAgB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"AppNaviButton.js","sourceRoot":"","sources":["../../../src/components/AppNavi/AppNaviButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyB,MAAM,OAAO,CAAA;AAC7C,OAAO,MAAM,MAAM,mBAAmB,CAAA;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAE/C,OAAO,EAAkB,gBAAgB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAiB1C,MAAM,CAAC,MAAM,aAAa,GAAoB,CAAC,EAC7C,QAAQ,EACR,IAAI,EACJ,OAAO,GAAG,KAAK,EACf,aAAa,GAAG,KAAK,EACrB,OAAO,GACR,EAAE,EAAE;IACH,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAA;IACxB,MAAM,UAAU,GAAG,aAAa,EAAE,CAAA;IAClC,MAAM,aAAa,GAAG,gBAAgB,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;IAEhE,OAAO,CACL,oBAAC,MAAM,IACL,MAAM,EAAE,KAAK,kBACC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,EAC1C,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,OAAO,EACjB,QAAQ,EAAE,aAAa,EACvB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAC,QAAQ,EACb,SAAS,EAAE,UAAU,CAAC,MAAM;QAE3B,aAAa;QACb,QAAQ,CACF,CACV,CAAA;AACH,CAAC,CAAA;AAED,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,CAAiB,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAA"}
|
|
@@ -8,13 +8,16 @@ export const AppNaviDropdown = ({ children, dropdownContent, icon, current = fal
|
|
|
8
8
|
const theme = useTheme();
|
|
9
9
|
const iconComponent = getIconComponent(theme, { icon, current });
|
|
10
10
|
return (React.createElement(Dropdown, null,
|
|
11
|
-
React.createElement(
|
|
11
|
+
React.createElement(StyledDropdownTrigger, null,
|
|
12
12
|
React.createElement(TriggerButton, { themes: theme, "aria-current": current ? 'page' : undefined, isActive: current, disabled: isUnclickable, isUnclickable: isUnclickable, type: "button", displayCaret: displayCaret },
|
|
13
13
|
iconComponent,
|
|
14
14
|
children,
|
|
15
15
|
displayCaret && React.createElement(FaCaretDownIcon, null))),
|
|
16
16
|
React.createElement(DropdownContent, null, dropdownContent)));
|
|
17
17
|
};
|
|
18
|
+
const StyledDropdownTrigger = styled(DropdownTrigger) `
|
|
19
|
+
height: 100%;
|
|
20
|
+
`;
|
|
18
21
|
const TriggerButton = styled.button(({ displayCaret, ...props }) => css `
|
|
19
22
|
${getItemStyle(props)}
|
|
20
23
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppNaviDropdown.js","sourceRoot":"","sources":["../../../src/components/AppNavi/AppNaviDropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyB,MAAM,OAAO,CAAA;AAC7C,OAAO,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AACxE,OAAO,EAAE,eAAe,EAA+B,MAAM,SAAS,CAAA;AACtE,OAAO,EAAkB,gBAAgB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAkBhF,MAAM,CAAC,MAAM,eAAe,GAAoB,CAAC,EAC/C,QAAQ,EACR,eAAe,EACf,IAAI,EACJ,OAAO,GAAG,KAAK,EACf,aAAa,GAAG,KAAK,EACrB,YAAY,GACb,EAAE,EAAE;IACH,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAA;IACxB,MAAM,aAAa,GAAG,gBAAgB,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;IAEhE,OAAO,CACL,oBAAC,QAAQ;QACP,oBAAC,
|
|
1
|
+
{"version":3,"file":"AppNaviDropdown.js","sourceRoot":"","sources":["../../../src/components/AppNavi/AppNaviDropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyB,MAAM,OAAO,CAAA;AAC7C,OAAO,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AACxE,OAAO,EAAE,eAAe,EAA+B,MAAM,SAAS,CAAA;AACtE,OAAO,EAAkB,gBAAgB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAkBhF,MAAM,CAAC,MAAM,eAAe,GAAoB,CAAC,EAC/C,QAAQ,EACR,eAAe,EACf,IAAI,EACJ,OAAO,GAAG,KAAK,EACf,aAAa,GAAG,KAAK,EACrB,YAAY,GACb,EAAE,EAAE;IACH,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAA;IACxB,MAAM,aAAa,GAAG,gBAAgB,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;IAEhE,OAAO,CACL,oBAAC,QAAQ;QACP,oBAAC,qBAAqB;YACpB,oBAAC,aAAa,IACZ,MAAM,EAAE,KAAK,kBACC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,EAC1C,QAAQ,EAAE,OAAO,EACjB,QAAQ,EAAE,aAAa,EACvB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAC,QAAQ,EACb,YAAY,EAAE,YAAY;gBAEzB,aAAa;gBACb,QAAQ;gBACR,YAAY,IAAI,oBAAC,eAAe,OAAG,CACtB,CACM;QAExB,oBAAC,eAAe,QAAE,eAAe,CAAmB,CAC3C,CACZ,CAAA;AACH,CAAC,CAAA;AAED,MAAM,qBAAqB,GAAG,MAAM,CAAC,eAAe,CAAC,CAAA;;CAEpD,CAAA;AACD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CACjC,CAAC,EAAE,YAAY,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE,CAAC,GAAG,CAAA;MAC/B,YAAY,CAAC,KAAK,CAAC;;MAEnB,YAAY;IACd,GAAG,CAAA;;;;;;KAMF;GACF,CACF,CAAA"}
|
|
@@ -19,6 +19,8 @@ export const getItemStyle = ({ themes: { color: { hoverColor, MAIN, TEXT_BLACK,
|
|
|
19
19
|
display: flex;
|
|
20
20
|
align-items: center;
|
|
21
21
|
gap: ${spacingByChar(0.5)};
|
|
22
|
+
height: 100%;
|
|
23
|
+
box-sizing: border-box;
|
|
22
24
|
margin: 0;
|
|
23
25
|
border: none;
|
|
24
26
|
background-color: transparent;
|
|
@@ -28,6 +30,7 @@ export const getItemStyle = ({ themes: { color: { hoverColor, MAIN, TEXT_BLACK,
|
|
|
28
30
|
font-weight: bold;
|
|
29
31
|
line-height: ${leading.NONE};
|
|
30
32
|
color: ${TEXT_GREY};
|
|
33
|
+
white-space: nowrap;
|
|
31
34
|
|
|
32
35
|
${isActive &&
|
|
33
36
|
css `
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appNaviHelper.js","sourceRoot":"","sources":["../../../src/components/AppNavi/appNaviHelper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAMvC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,KAAY,EACZ,OAAsE,EACtE,EAAE;IACF,MAAM,IAAI,GAAG;QACX,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,KAAK;QACd,GAAG,OAAO;KACX,CAAA;IACD,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC,KAAK,CAAA;IAE7C,IAAI,CAAC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAA;IAE3B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;IAEtB,MAAM,SAAS,GAAG;QAChB,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;KAC7C,CAAA;IAED,OAAO,oBAAC,IAAI,OAAK,SAAS,GAAI,CAAA;AAChC,CAAC,CAAA;AAOD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAC3B,MAAM,EAAE,EACN,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,EACzD,QAAQ,EACR,OAAO,EACP,aAAa,GACd,EACD,QAAQ,EACR,aAAa,GACE,EAAE,EAAE,CACnB,GAAG,CAAA;;;WAGM,aAAa,CAAC,GAAG,CAAC
|
|
1
|
+
{"version":3,"file":"appNaviHelper.js","sourceRoot":"","sources":["../../../src/components/AppNavi/appNaviHelper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAMvC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,KAAY,EACZ,OAAsE,EACtE,EAAE;IACF,MAAM,IAAI,GAAG;QACX,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,KAAK;QACd,GAAG,OAAO;KACX,CAAA;IACD,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC,KAAK,CAAA;IAE7C,IAAI,CAAC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAA;IAE3B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;IAEtB,MAAM,SAAS,GAAG;QAChB,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;KAC7C,CAAA;IAED,OAAO,oBAAC,IAAI,OAAK,SAAS,GAAI,CAAA;AAChC,CAAC,CAAA;AAOD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAC3B,MAAM,EAAE,EACN,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,EACzD,QAAQ,EACR,OAAO,EACP,aAAa,GACd,EACD,QAAQ,EACR,aAAa,GACE,EAAE,EAAE,CACnB,GAAG,CAAA;;;WAGM,aAAa,CAAC,GAAG,CAAC;;;;;;eAMd,aAAa,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC;;iBAEvC,QAAQ,CAAC,CAAC;;mBAER,OAAO,CAAC,IAAI;aAClB,SAAS;;;MAGhB,QAAQ;IACV,GAAG,CAAA;eACQ,UAAU;;;;;;;;;4BASG,IAAI;kBACd,aAAa,CAAC,IAAI,CAAC;;KAEhC;MACC,CAAC,aAAa;IAChB,GAAG,CAAA;;;4BAGqB,UAAU,CAAC,KAAK,CAAC;;KAExC;GACF,CAAA"}
|
|
@@ -3,6 +3,7 @@ import styled, { css } from 'styled-components';
|
|
|
3
3
|
import { TertiaryLink } from './TertiaryLink';
|
|
4
4
|
import { validateElement } from './bottomFixedAreaHelper';
|
|
5
5
|
import { Base as BaseComponent } from '../Base';
|
|
6
|
+
import { Cluster, Stack } from '../Layout';
|
|
6
7
|
import { useTheme } from '../../hooks/useTheme';
|
|
7
8
|
import { useClassNames } from './useClassNames';
|
|
8
9
|
export const BottomFixedArea = ({ description, primaryButton, secondaryButton, tertiaryLinks, zIndex = 500, className = '', ...props }) => {
|
|
@@ -12,18 +13,17 @@ export const BottomFixedArea = ({ description, primaryButton, secondaryButton, t
|
|
|
12
13
|
validateElement(primaryButton, secondaryButton);
|
|
13
14
|
}, [primaryButton, secondaryButton]);
|
|
14
15
|
return (React.createElement(Base, { themes: theme, zIndex: zIndex, className: `${className} ${classNames.wrapper}`, ...props },
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
secondaryButton && React.createElement("
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
React.createElement(
|
|
16
|
+
React.createElement(Stack, null,
|
|
17
|
+
description && React.createElement(Text, { className: classNames.description }, description),
|
|
18
|
+
(secondaryButton || primaryButton) && (React.createElement(ListCluster, { justify: "center", gap: { row: 0.5, column: 1 } },
|
|
19
|
+
secondaryButton && React.createElement("li", { className: classNames.secondaryButton }, secondaryButton),
|
|
20
|
+
primaryButton && React.createElement("li", { className: classNames.primaryButton }, primaryButton))),
|
|
21
|
+
tertiaryLinks && tertiaryLinks.length > 0 && (React.createElement(ListCluster, { justify: "center", gap: { row: 0.5, column: 1 } }, tertiaryLinks.map((tertiaryLink, index) => (React.createElement("li", { key: index, className: classNames.tertiaryListItem },
|
|
22
|
+
React.createElement(TertiaryLink, { ...tertiaryLink })))))))));
|
|
21
23
|
};
|
|
22
24
|
const Base = styled(BaseComponent) `
|
|
23
25
|
${({ themes: { spacingByChar }, zIndex }) => {
|
|
24
26
|
return css `
|
|
25
|
-
display: flex;
|
|
26
|
-
flex-direction: column;
|
|
27
27
|
position: fixed;
|
|
28
28
|
bottom: 0;
|
|
29
29
|
width: 100%;
|
|
@@ -39,42 +39,11 @@ const Base = styled(BaseComponent) `
|
|
|
39
39
|
const Text = styled.div `
|
|
40
40
|
margin: 0;
|
|
41
41
|
`;
|
|
42
|
-
const
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
justify-content: center;
|
|
49
|
-
|
|
50
|
-
> li {
|
|
51
|
-
list-style: none;
|
|
52
|
-
margin-right: ${spacingByChar(1)};
|
|
53
|
-
|
|
54
|
-
&:last-of-type {
|
|
55
|
-
margin-right: 0;
|
|
56
|
-
}
|
|
57
|
-
}
|
|
58
|
-
`;
|
|
59
|
-
}}
|
|
60
|
-
`;
|
|
61
|
-
const TertiaryList = styled.ul `
|
|
62
|
-
${({ themes: { spacingByChar } }) => {
|
|
63
|
-
return css `
|
|
64
|
-
margin: ${spacingByChar(1)} 0 0 0;
|
|
65
|
-
padding: 0;
|
|
66
|
-
display: flex;
|
|
67
|
-
justify-content: center;
|
|
68
|
-
|
|
69
|
-
> li {
|
|
70
|
-
list-style: none;
|
|
71
|
-
margin-right: ${spacingByChar(1)};
|
|
72
|
-
|
|
73
|
-
&:last-of-type {
|
|
74
|
-
margin-right: 0;
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
`;
|
|
78
|
-
}}
|
|
42
|
+
const ListCluster = styled(Cluster).attrs({
|
|
43
|
+
as: 'ul',
|
|
44
|
+
}) `
|
|
45
|
+
list-style: none;
|
|
46
|
+
margin: 0;
|
|
47
|
+
padding: 0;
|
|
79
48
|
`;
|
|
80
49
|
//# sourceMappingURL=BottomFixedArea.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BottomFixedArea.js","sourceRoot":"","sources":["../../../src/components/BottomFixedArea/BottomFixedArea.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAMZ,SAAS,GACV,MAAM,OAAO,CAAA;AACd,OAAO,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAEzD,OAAO,EAAE,IAAI,IAAI,aAAa,EAAE,MAAM,SAAS,CAAA;AAO/C,OAAO,EAAS,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AA2B/C,MAAM,CAAC,MAAM,eAAe,GAA8B,CAAC,EACzD,WAAW,EACX,aAAa,EACb,eAAe,EACf,aAAa,EACb,MAAM,GAAG,GAAG,EACZ,SAAS,GAAG,EAAE,EACd,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAA;IACxB,MAAM,UAAU,GAAG,aAAa,EAAE,CAAA;IAElC,SAAS,CAAC,GAAG,EAAE;QACb,eAAe,CAAC,aAAa,EAAE,eAAe,CAAC,CAAA;IACjD,CAAC,EAAE,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC,CAAA;IAEpC,OAAO,CACL,oBAAC,IAAI,IACH,MAAM,EAAE,KAAK,EACb,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,GAAG,SAAS,IAAI,UAAU,CAAC,OAAO,EAAE,KAC3C,KAAK;
|
|
1
|
+
{"version":3,"file":"BottomFixedArea.js","sourceRoot":"","sources":["../../../src/components/BottomFixedArea/BottomFixedArea.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAMZ,SAAS,GACV,MAAM,OAAO,CAAA;AACd,OAAO,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAEzD,OAAO,EAAE,IAAI,IAAI,aAAa,EAAE,MAAM,SAAS,CAAA;AAO/C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAS,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AA2B/C,MAAM,CAAC,MAAM,eAAe,GAA8B,CAAC,EACzD,WAAW,EACX,aAAa,EACb,eAAe,EACf,aAAa,EACb,MAAM,GAAG,GAAG,EACZ,SAAS,GAAG,EAAE,EACd,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAA;IACxB,MAAM,UAAU,GAAG,aAAa,EAAE,CAAA;IAElC,SAAS,CAAC,GAAG,EAAE;QACb,eAAe,CAAC,aAAa,EAAE,eAAe,CAAC,CAAA;IACjD,CAAC,EAAE,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC,CAAA;IAEpC,OAAO,CACL,oBAAC,IAAI,IACH,MAAM,EAAE,KAAK,EACb,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,GAAG,SAAS,IAAI,UAAU,CAAC,OAAO,EAAE,KAC3C,KAAK;QAET,oBAAC,KAAK;YACH,WAAW,IAAI,oBAAC,IAAI,IAAC,SAAS,EAAE,UAAU,CAAC,WAAW,IAAG,WAAW,CAAQ;YAC5E,CAAC,eAAe,IAAI,aAAa,CAAC,IAAI,CACrC,oBAAC,WAAW,IAAC,OAAO,EAAC,QAAQ,EAAC,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE;gBACvD,eAAe,IAAI,4BAAI,SAAS,EAAE,UAAU,CAAC,eAAe,IAAG,eAAe,CAAM;gBACpF,aAAa,IAAI,4BAAI,SAAS,EAAE,UAAU,CAAC,aAAa,IAAG,aAAa,CAAM,CACnE,CACf;YACA,aAAa,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,CAC5C,oBAAC,WAAW,IAAC,OAAO,EAAC,QAAQ,EAAC,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,IACvD,aAAa,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE,CAAC,CAC1C,4BAAI,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC,gBAAgB;gBACpD,oBAAC,YAAY,OAAK,YAAY,GAAI,CAC/B,CACN,CAAC,CACU,CACf,CACK,CACH,CACR,CAAA;AACH,CAAC,CAAA;AAED,MAAM,IAAI,GAAG,MAAM,CAAC,aAAa,CAAC,CAAmC;IACjE,CAAC,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;IAC1C,OAAO,GAAG,CAAA;;;;iBAIG,aAAa,CAAC,GAAG,CAAC;;iBAElB,MAAM;;;;KAIlB,CAAA;AACH,CAAC;CACF,CAAA;AACD,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAA;;CAEtB,CAAA;AACD,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC;IACxC,EAAE,EAAE,IAAI;CACT,CAAC,CAAA;;;;CAID,CAAA"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { ChangeEvent, HTMLAttributes } from 'react';
|
|
2
|
-
import {
|
|
2
|
+
import { ComboBoxItem } from './types';
|
|
3
3
|
declare type Props<T> = {
|
|
4
4
|
/**
|
|
5
5
|
* 選択可能なアイテムのリスト
|
|
6
6
|
*/
|
|
7
|
-
items: Array<
|
|
7
|
+
items: Array<ComboBoxItem<T>>;
|
|
8
8
|
/**
|
|
9
9
|
* 選択されているアイテムのリスト
|
|
10
10
|
*/
|
|
11
|
-
selectedItems: Array<
|
|
11
|
+
selectedItems: Array<ComboBoxItem<T> & {
|
|
12
12
|
deletable?: boolean;
|
|
13
13
|
}>;
|
|
14
14
|
/**
|
|
@@ -68,15 +68,15 @@ declare type Props<T> = {
|
|
|
68
68
|
/**
|
|
69
69
|
* 選択されているアイテムの削除ボタンがクリックされた時に発火するコールバック関数
|
|
70
70
|
*/
|
|
71
|
-
onDelete?: (item:
|
|
71
|
+
onDelete?: (item: ComboBoxItem<T>) => void;
|
|
72
72
|
/**
|
|
73
73
|
* アイテムが選択された時に発火するコールバック関数
|
|
74
74
|
*/
|
|
75
|
-
onSelect?: (item:
|
|
75
|
+
onSelect?: (item: ComboBoxItem<T>) => void;
|
|
76
76
|
/**
|
|
77
77
|
* 選択されているアイテムのリストが変わった時に発火するコールバック関数
|
|
78
78
|
*/
|
|
79
|
-
onChangeSelected?: (selectedItems: Array<
|
|
79
|
+
onChangeSelected?: (selectedItems: Array<ComboBoxItem<T>>) => void;
|
|
80
80
|
/**
|
|
81
81
|
* コンポーネントがフォーカスされたときに発火するコールバック関数
|
|
82
82
|
*/
|
|
@@ -18,14 +18,14 @@ export function MultiComboBox({ items, selectedItems, name, disabled = false, er
|
|
|
18
18
|
const [uncontrolledInputValue, setUncontrolledInputValue] = useState('');
|
|
19
19
|
const inputValue = isInputControlled ? controlledInputValue : uncontrolledInputValue;
|
|
20
20
|
const [isComposing, setIsComposing] = useState(false);
|
|
21
|
-
const selectedLabels = selectedItems.map(({ label }) => label);
|
|
22
|
-
const filteredItems = items.filter(({ label }) => {
|
|
21
|
+
const selectedLabels = useMemo(() => selectedItems.map(({ label }) => label), [selectedItems]);
|
|
22
|
+
const filteredItems = useMemo(() => items.filter(({ label }) => {
|
|
23
23
|
if (selectedLabels.includes(label))
|
|
24
24
|
return false;
|
|
25
25
|
if (!inputValue)
|
|
26
26
|
return true;
|
|
27
27
|
return convertMatchableString(label).includes(convertMatchableString(inputValue));
|
|
28
|
-
});
|
|
28
|
+
}), [inputValue, items, selectedLabels]);
|
|
29
29
|
const isDuplicate = items.some((item) => item.label === inputValue);
|
|
30
30
|
const hasSelectableExactMatch = filteredItems.some((item) => item.label === inputValue);
|
|
31
31
|
const { renderListBox, calculateDropdownRect, resetActiveOptionIndex, handleInputKeyDown, listBoxRef, aria, } = useListBox({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MultiComboBox.js","sourceRoot":"","sources":["../../../src/components/ComboBox/MultiComboBox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAGZ,WAAW,EACX,eAAe,EACf,OAAO,EACP,MAAM,EACN,QAAQ,GACT,MAAM,OAAO,CAAA;AACd,OAAO,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,EAAS,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAA;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AA0FzD,MAAM,UAAU,aAAa,CAAI,EAC/B,KAAK,EACL,aAAa,EACb,IAAI,EACJ,QAAQ,GAAG,KAAK,EAChB,KAAK,GAAG,KAAK,EACb,SAAS,GAAG,KAAK,EACjB,WAAW,GAAG,EAAE,EAChB,SAAS,EACT,oBAAoB,EACpB,KAAK,GAAG,MAAM,EACd,UAAU,EAAE,oBAAoB,EAChC,SAAS,GAAG,EAAE,EACd,QAAQ,EACR,aAAa,EACb,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,gBAAgB,EAChB,OAAO,EACP,MAAM,EACN,GAAG,KAAK,EACmB;IAC3B,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAA;IACxB,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC,KAAK,CAAA;IACxC,MAAM,QAAQ,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAA;IAC7C,MAAM,QAAQ,GAAG,MAAM,CAAmB,IAAI,CAAC,CAAA;IAC/C,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IACjD,MAAM,iBAAiB,GAAG,OAAO,CAC/B,GAAG,EAAE,CAAC,oBAAoB,KAAK,SAAS,EACxC,CAAC,oBAAoB,CAAC,CACvB,CAAA;IACD,MAAM,CAAC,sBAAsB,EAAE,yBAAyB,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAA;IACxE,MAAM,UAAU,GAAG,iBAAiB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,sBAAsB,CAAA;IACpF,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IACrD,MAAM,cAAc,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"MultiComboBox.js","sourceRoot":"","sources":["../../../src/components/ComboBox/MultiComboBox.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
|
-
import {
|
|
2
|
+
import { ComboBoxItem } from './types';
|
|
3
3
|
export declare type Props<T> = {
|
|
4
|
-
item:
|
|
4
|
+
item: ComboBoxItem<T> & {
|
|
5
5
|
deletable?: boolean;
|
|
6
6
|
};
|
|
7
7
|
disabled: boolean;
|
|
8
|
-
onDelete: (item:
|
|
8
|
+
onDelete: (item: ComboBoxItem<T>) => void;
|
|
9
9
|
enableEllipsis?: boolean;
|
|
10
10
|
onEllipsis?: () => void;
|
|
11
11
|
};
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { ChangeEvent, HTMLAttributes } from 'react';
|
|
2
|
-
import {
|
|
2
|
+
import { ComboBoxItem } from './types';
|
|
3
3
|
declare type Props<T> = {
|
|
4
4
|
/**
|
|
5
5
|
* 選択可能なアイテムのリスト
|
|
6
6
|
*/
|
|
7
|
-
items: Array<
|
|
7
|
+
items: Array<ComboBoxItem<T>>;
|
|
8
8
|
/**
|
|
9
9
|
* 選択されているアイテムのリスト
|
|
10
10
|
*/
|
|
11
|
-
selectedItem:
|
|
11
|
+
selectedItem: ComboBoxItem<T> | null;
|
|
12
12
|
/**
|
|
13
13
|
* input 要素の `name` 属性の値
|
|
14
14
|
*/
|
|
@@ -57,7 +57,7 @@ declare type Props<T> = {
|
|
|
57
57
|
/**
|
|
58
58
|
* アイテムが選択された時に発火するコールバック関数
|
|
59
59
|
*/
|
|
60
|
-
onSelect?: (item:
|
|
60
|
+
onSelect?: (item: ComboBoxItem<T>) => void;
|
|
61
61
|
/**
|
|
62
62
|
* 選択されているアイテムがクリアされた時に発火するコールバック関数
|
|
63
63
|
*/
|
|
@@ -65,7 +65,7 @@ declare type Props<T> = {
|
|
|
65
65
|
/**
|
|
66
66
|
* 選択されているアイテムのリストが変わった時に発火するコールバック関数
|
|
67
67
|
*/
|
|
68
|
-
onChangeSelected?: (selectedItem:
|
|
68
|
+
onChangeSelected?: (selectedItem: ComboBoxItem<T> | null) => void;
|
|
69
69
|
};
|
|
70
70
|
declare type ElementProps<T> = Omit<HTMLAttributes<HTMLDivElement>, keyof Props<T>>;
|
|
71
71
|
export declare function SingleComboBox<T>({ items, selectedItem, name, disabled, error, creatable, placeholder, isLoading, width, className, onChange, onChangeInput, onAdd, onSelect, onClear, onChangeSelected, ...props }: Props<T> & ElementProps<T>): JSX.Element;
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import {
|
|
2
|
+
import { ComboBoxItem } from './types';
|
|
3
3
|
declare type Args<T> = {
|
|
4
|
-
items: Array<
|
|
4
|
+
items: Array<ComboBoxItem<T> & {
|
|
5
5
|
isSelected?: boolean;
|
|
6
6
|
}>;
|
|
7
7
|
inputValue?: string;
|
|
8
8
|
onAdd?: (label: string) => void;
|
|
9
|
-
onSelect: (item:
|
|
9
|
+
onSelect: (item: ComboBoxItem<T>) => void;
|
|
10
10
|
isExpanded: boolean;
|
|
11
11
|
isAddable: boolean;
|
|
12
12
|
isDuplicate: boolean;
|
|
@@ -6,6 +6,7 @@ import { usePortal } from '../../hooks/usePortal';
|
|
|
6
6
|
import { useId } from '../../hooks/useId';
|
|
7
7
|
import { FaPlusCircleIcon } from '../Icon';
|
|
8
8
|
import { Loader } from '../Loader';
|
|
9
|
+
const OPTION_INCREMENT_AMOUNT = 100;
|
|
9
10
|
function optionToItem(option) {
|
|
10
11
|
const { isAdding, isSelected, ...props } = option;
|
|
11
12
|
return { ...props };
|
|
@@ -53,13 +54,19 @@ export function useListBox({ items, inputValue = '', onAdd, onSelect, isExpanded
|
|
|
53
54
|
height,
|
|
54
55
|
});
|
|
55
56
|
}, []);
|
|
57
|
+
const [optionLength, setOptionLength] = useState(OPTION_INCREMENT_AMOUNT);
|
|
58
|
+
useEffect(() => {
|
|
59
|
+
// 表示 option 数を初期化
|
|
60
|
+
setOptionLength(OPTION_INCREMENT_AMOUNT);
|
|
61
|
+
}, [items]);
|
|
56
62
|
const options = useMemo(() => {
|
|
63
|
+
const limitedItems = items.slice(0, optionLength + 1);
|
|
57
64
|
if (isAddable) {
|
|
58
65
|
const addingOption = { label: inputValue, value: inputValue, isAdding: true };
|
|
59
|
-
return [addingOption, ...
|
|
66
|
+
return [addingOption, ...limitedItems];
|
|
60
67
|
}
|
|
61
|
-
return
|
|
62
|
-
}, [inputValue, isAddable, items]);
|
|
68
|
+
return limitedItems;
|
|
69
|
+
}, [inputValue, isAddable, items, optionLength]);
|
|
63
70
|
const moveActiveOptionIndex = useCallback((currentIndex, delta) => {
|
|
64
71
|
if (options.filter((option) => !option.disabled).length === 0) {
|
|
65
72
|
return;
|
|
@@ -150,29 +157,49 @@ export function useListBox({ items, inputValue = '', onAdd, onSelect, isExpanded
|
|
|
150
157
|
const theme = useTheme();
|
|
151
158
|
const { portalRoot } = usePortal();
|
|
152
159
|
const listBoxRef = useRef(null);
|
|
160
|
+
const bottomIntersectionRef = useRef(null);
|
|
161
|
+
const isDisplayingPartial = optionLength < items.length;
|
|
162
|
+
const scrollObserver = useMemo(
|
|
163
|
+
// スクロール最下部に到達する度に表示する option 数を増加させるための IntersectionObserver
|
|
164
|
+
() => new IntersectionObserver((entries) => {
|
|
165
|
+
const entry = entries[0];
|
|
166
|
+
if (entry && entry.isIntersecting && isDisplayingPartial) {
|
|
167
|
+
setOptionLength((current) => current + OPTION_INCREMENT_AMOUNT);
|
|
168
|
+
}
|
|
169
|
+
}), [isDisplayingPartial]);
|
|
170
|
+
useEffect(() => {
|
|
171
|
+
// IntersectionObserver を設定
|
|
172
|
+
if (!bottomIntersectionRef.current) {
|
|
173
|
+
return;
|
|
174
|
+
}
|
|
175
|
+
scrollObserver.observe(bottomIntersectionRef.current);
|
|
176
|
+
return () => scrollObserver.disconnect();
|
|
177
|
+
}, [scrollObserver]);
|
|
153
178
|
const renderListBox = () => {
|
|
154
|
-
return createPortal(React.createElement(Container, { ...dropdownStyle, themes: theme, id: listBoxId, ref: listBoxRef, role: "listbox", "aria-hidden": !isExpanded, className: classNames.dropdownList },
|
|
155
|
-
React.createElement(
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
179
|
+
return createPortal(React.createElement(Container, { ...dropdownStyle, themes: theme, id: listBoxId, ref: listBoxRef, role: "listbox", "aria-hidden": !isExpanded, className: classNames.dropdownList },
|
|
180
|
+
isLoading ? (React.createElement(LoaderWrapper, { themes: theme },
|
|
181
|
+
React.createElement(Loader, null))) : (React.createElement(React.Fragment, null,
|
|
182
|
+
options.map((option, i) => {
|
|
183
|
+
const isActive = activeOptionIndex === i;
|
|
184
|
+
const className = isActive ? 'active' : '';
|
|
185
|
+
const { label, disabled, isAdding, isSelected } = option;
|
|
186
|
+
if (isAdding) {
|
|
187
|
+
return (React.createElement(AddButton, { key: `add-${label}`, themes: theme, onClick: () => {
|
|
188
|
+
onAdd && onAdd(label);
|
|
189
|
+
}, onMouseOver: () => setActiveOptionIndex(0), id: addingButtonId, role: "option", className: `${className} ${classNames.addButton}` },
|
|
190
|
+
React.createElement(AddIcon, { color: theme.color.TEXT_LINK, "$theme": theme }),
|
|
191
|
+
React.createElement(AddText, { themes: theme },
|
|
192
|
+
"\u300C",
|
|
193
|
+
label,
|
|
194
|
+
"\u300D\u3092\u8FFD\u52A0")));
|
|
195
|
+
}
|
|
196
|
+
return (React.createElement(SelectButton, { key: `item-${label}`, type: "button", themes: theme, disabled: disabled, onClick: () => {
|
|
197
|
+
onSelect(optionToItem(option));
|
|
198
|
+
}, onMouseOver: () => setActiveOptionIndex(i), id: getOptionId(option), role: "option", className: `${className} ${classNames.selectButton}`, "aria-selected": isSelected }, label));
|
|
199
|
+
}),
|
|
200
|
+
isDuplicate && (React.createElement(NoItems, { themes: theme, role: "alert", "aria-live": "polite", className: classNames.noItems }, "\u91CD\u8907\u3059\u308B\u9078\u629E\u80A2\u306F\u8FFD\u52A0\u3067\u304D\u307E\u305B\u3093")),
|
|
201
|
+
hasNoMatch && (React.createElement(NoItems, { themes: theme, role: "alert", "aria-live": "polite", className: classNames.noItems }, "\u4E00\u81F4\u3059\u308B\u9078\u629E\u80A2\u304C\u3042\u308A\u307E\u305B\u3093")))),
|
|
202
|
+
React.createElement("div", { ref: bottomIntersectionRef })), portalRoot);
|
|
176
203
|
};
|
|
177
204
|
return {
|
|
178
205
|
renderListBox,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useListBox.js","sourceRoot":"","sources":["../../../src/components/ComboBox/useListBox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,EAAS,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAGzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"useListBox.js","sourceRoot":"","sources":["../../../src/components/ComboBox/useListBox.tsx"],"names":[],"mappings":"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"}
|
|
@@ -100,7 +100,7 @@ export const ModelessDialog = ({ header, children, footer, isOpen, onClickClose,
|
|
|
100
100
|
const labelId = useId();
|
|
101
101
|
const classNames = useClassNames().modelessDialog;
|
|
102
102
|
return createPortal(React.createElement(DialogOverlap, { isOpen: isOpen },
|
|
103
|
-
React.createElement(Draggable, { handle: `.${classNames.
|
|
103
|
+
React.createElement(Draggable, { handle: `.${classNames.handle}`, onStart: (_, data) => setPosition({ x: data.x, y: data.y }), onDrag: (_, data) => {
|
|
104
104
|
setPosition((prev) => {
|
|
105
105
|
return {
|
|
106
106
|
x: prev.x + data.deltaX,
|
|
@@ -120,7 +120,7 @@ export const ModelessDialog = ({ header, children, footer, isOpen, onClickClose,
|
|
|
120
120
|
React.createElement("div", { tabIndex: -1 }),
|
|
121
121
|
React.createElement(Header, { className: classNames.header, themes: theme },
|
|
122
122
|
React.createElement(Title, { id: labelId, themes: theme }, header),
|
|
123
|
-
React.createElement(DialogHandler, { themes: theme, tabIndex: 0, role: "slider", "aria-label": "\u30C0\u30A4\u30A2\u30ED\u30B0\u306E\u4F4D\u7F6E", "aria-valuetext": wrapperPosition &&
|
|
123
|
+
React.createElement(DialogHandler, { className: classNames.handle, themes: theme, tabIndex: 0, role: "slider", "aria-label": "\u30C0\u30A4\u30A2\u30ED\u30B0\u306E\u4F4D\u7F6E", "aria-valuetext": wrapperPosition &&
|
|
124
124
|
`上から${Math.trunc(wrapperPosition.top)}px、
|
|
125
125
|
左から${Math.trunc(wrapperPosition.left)}px`, onKeyDown: handleArrowKey },
|
|
126
126
|
React.createElement(FaGripHorizontalIcon, null)),
|
|
@@ -171,7 +171,7 @@ const DialogHandler = styled.div `
|
|
|
171
171
|
justify-content: center;
|
|
172
172
|
transition: color 0.1s ease;
|
|
173
173
|
|
|
174
|
-
|
|
174
|
+
&:hover {
|
|
175
175
|
color: ${color.TEXT_GREY};
|
|
176
176
|
}
|
|
177
177
|
|