@vkontakte/vkui 4.20.0 → 4.22.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.
- package/.cache/.eslintcache +1 -1
- package/.cache/.stylelintcache +1 -1
- package/.cache/.tsbuildinfo +414 -116
- package/.cache/ts/src/components/Avatar/Avatar.d.ts +2 -0
- package/.cache/ts/src/components/Cell/Cell.d.ts +11 -0
- package/.cache/ts/src/components/Cell/CellCheckbox/CellCheckbox.d.ts +5 -0
- package/.cache/ts/src/components/Cell/CellDragger/CellDragger.d.ts +6 -0
- package/.cache/ts/src/components/Cell/useDraggable.d.ts +13 -0
- package/.cache/ts/src/components/CustomSelect/CustomSelect.d.ts +0 -1
- package/.cache/ts/src/components/DropdownIcon/DropdownIcon.d.ts +3 -0
- package/.cache/ts/src/components/FocusTrap/FocusTrap.d.ts +2 -3
- package/.cache/ts/src/components/FormField/FormField.d.ts +2 -3
- package/.cache/ts/src/components/FormItem/FormItem.d.ts +2 -3
- package/.cache/ts/src/components/FormLayout/FormLayout.d.ts +2 -4
- package/.cache/ts/src/components/GridAvatar/GridAvatar.d.ts +9 -0
- package/.cache/ts/src/components/HorizontalCell/HorizontalCell.d.ts +2 -3
- package/.cache/ts/src/components/HorizontalScroll/HorizontalScroll.d.ts +3 -2
- package/.cache/ts/src/components/InitialsAvatar/InitialsAvatar.d.ts +33 -0
- package/.cache/ts/src/components/Link/Link.d.ts +1 -2
- package/.cache/ts/src/components/ModalRoot/types.d.ts +0 -1
- package/.cache/ts/src/components/ModalRoot/useModalManager.d.ts +37 -0
- package/.cache/ts/src/components/Removable/Removable.d.ts +2 -1
- package/.cache/ts/src/components/SimpleCell/SimpleCell.d.ts +2 -2
- package/.cache/ts/src/components/SplitCol/SplitCol.d.ts +3 -3
- package/.cache/ts/src/components/SubnavigationBar/SubnavigationBar.d.ts +2 -1
- package/.cache/ts/src/components/Switch/Switch.d.ts +2 -3
- package/.cache/ts/src/components/TabbarItem/TabbarItem.d.ts +3 -1
- package/.cache/ts/src/components/Tappable/Tappable.d.ts +2 -3
- package/.cache/ts/src/components/Touch/Touch.d.ts +16 -17
- package/.cache/ts/src/components/Typography/Caption/Caption.d.ts +2 -2
- package/.cache/ts/src/components/Typography/Headline/Headline.d.ts +2 -2
- package/.cache/ts/src/components/Typography/Subhead/Subhead.d.ts +2 -2
- package/.cache/ts/src/components/Typography/Text/Text.d.ts +2 -3
- package/.cache/ts/src/components/Typography/Title/Title.d.ts +2 -2
- package/.cache/ts/src/components/View/utils.d.ts +2 -0
- package/.cache/ts/src/index.d.ts +4 -0
- package/.cache/ts/src/lib/accessibility.d.ts +1 -1
- package/.cache/ts/src/lib/supportEvents.d.ts +3 -1
- package/.cache/ts/src/types.d.ts +3 -0
- package/dist/cjs/components/ActionSheet/ActionSheet.js +7 -9
- package/dist/cjs/components/ActionSheet/ActionSheet.js.map +1 -1
- package/dist/cjs/components/Avatar/Avatar.d.ts +2 -0
- package/dist/cjs/components/Avatar/Avatar.js +7 -3
- package/dist/cjs/components/Avatar/Avatar.js.map +1 -1
- package/dist/cjs/components/Banner/Banner.js.map +1 -1
- package/dist/cjs/components/Button/Button.js.map +1 -1
- package/dist/cjs/components/CardScroll/CardScroll.js +1 -1
- package/dist/cjs/components/CardScroll/CardScroll.js.map +1 -1
- package/dist/cjs/components/Cell/Cell.d.ts +11 -0
- package/dist/cjs/components/Cell/Cell.js +109 -182
- package/dist/cjs/components/Cell/Cell.js.map +1 -1
- package/dist/cjs/components/Cell/CellCheckbox/CellCheckbox.d.ts +5 -0
- package/dist/cjs/components/Cell/CellCheckbox/CellCheckbox.js +50 -0
- package/dist/cjs/components/Cell/CellCheckbox/CellCheckbox.js.map +1 -0
- package/dist/cjs/components/Cell/CellDragger/CellDragger.d.ts +6 -0
- package/dist/cjs/components/Cell/CellDragger/CellDragger.js +53 -0
- package/dist/cjs/components/Cell/CellDragger/CellDragger.js.map +1 -0
- package/dist/cjs/components/Cell/useDraggable.d.ts +13 -0
- package/dist/cjs/components/Cell/useDraggable.js +142 -0
- package/dist/cjs/components/Cell/useDraggable.js.map +1 -0
- package/dist/cjs/components/ChipsSelect/ChipsSelect.js +2 -2
- package/dist/cjs/components/ChipsSelect/ChipsSelect.js.map +1 -1
- package/dist/cjs/components/Counter/Counter.js.map +1 -1
- package/dist/cjs/components/CustomSelect/CustomSelect.d.ts +0 -1
- package/dist/cjs/components/CustomSelect/CustomSelect.js +2 -3
- package/dist/cjs/components/CustomSelect/CustomSelect.js.map +1 -1
- package/dist/cjs/components/DropdownIcon/DropdownIcon.d.ts +3 -0
- package/dist/cjs/components/DropdownIcon/DropdownIcon.js +37 -0
- package/dist/cjs/components/DropdownIcon/DropdownIcon.js.map +1 -0
- package/dist/cjs/components/FocusTrap/FocusTrap.d.ts +2 -3
- package/dist/cjs/components/FocusTrap/FocusTrap.js +3 -5
- package/dist/cjs/components/FocusTrap/FocusTrap.js.map +1 -1
- package/dist/cjs/components/FormField/FormField.d.ts +2 -3
- package/dist/cjs/components/FormField/FormField.js.map +1 -1
- package/dist/cjs/components/FormItem/FormItem.d.ts +2 -3
- package/dist/cjs/components/FormItem/FormItem.js.map +1 -1
- package/dist/cjs/components/FormLayout/FormLayout.d.ts +2 -4
- package/dist/cjs/components/FormLayout/FormLayout.js.map +1 -1
- package/dist/cjs/components/FormLayoutGroup/FormLayoutGroup.js +1 -0
- package/dist/cjs/components/FormLayoutGroup/FormLayoutGroup.js.map +1 -1
- package/dist/cjs/components/GridAvatar/GridAvatar.d.ts +9 -0
- package/dist/cjs/components/GridAvatar/GridAvatar.js +61 -0
- package/dist/cjs/components/GridAvatar/GridAvatar.js.map +1 -0
- package/dist/cjs/components/Header/Header.js.map +1 -1
- package/dist/cjs/components/HorizontalCell/HorizontalCell.d.ts +2 -3
- package/dist/cjs/components/HorizontalCell/HorizontalCell.js.map +1 -1
- package/dist/cjs/components/HorizontalScroll/HorizontalScroll.d.ts +3 -2
- package/dist/cjs/components/HorizontalScroll/HorizontalScroll.js +10 -13
- package/dist/cjs/components/HorizontalScroll/HorizontalScroll.js.map +1 -1
- package/dist/cjs/components/InitialsAvatar/InitialsAvatar.d.ts +33 -0
- package/dist/cjs/components/InitialsAvatar/InitialsAvatar.js +64 -0
- package/dist/cjs/components/InitialsAvatar/InitialsAvatar.js.map +1 -0
- package/dist/cjs/components/Link/Link.d.ts +1 -2
- package/dist/cjs/components/Link/Link.js.map +1 -1
- package/dist/cjs/components/ModalRoot/ModalRoot.js +170 -373
- package/dist/cjs/components/ModalRoot/ModalRoot.js.map +1 -1
- package/dist/cjs/components/ModalRoot/ModalRootContext.js +0 -3
- package/dist/cjs/components/ModalRoot/ModalRootContext.js.map +1 -1
- package/dist/cjs/components/ModalRoot/ModalRootDesktop.js +59 -241
- package/dist/cjs/components/ModalRoot/ModalRootDesktop.js.map +1 -1
- package/dist/cjs/components/ModalRoot/types.d.ts +0 -1
- package/dist/cjs/components/ModalRoot/types.js.map +1 -1
- package/dist/cjs/components/ModalRoot/useModalManager.d.ts +37 -0
- package/dist/cjs/components/ModalRoot/useModalManager.js +213 -0
- package/dist/cjs/components/ModalRoot/useModalManager.js.map +1 -0
- package/dist/cjs/components/NativeSelect/NativeSelect.js +2 -2
- package/dist/cjs/components/NativeSelect/NativeSelect.js.map +1 -1
- package/dist/cjs/components/Removable/Removable.d.ts +2 -1
- package/dist/cjs/components/Removable/Removable.js +75 -66
- package/dist/cjs/components/Removable/Removable.js.map +1 -1
- package/dist/cjs/components/SelectMimicry/SelectMimicry.js +2 -2
- package/dist/cjs/components/SelectMimicry/SelectMimicry.js.map +1 -1
- package/dist/cjs/components/SimpleCell/SimpleCell.d.ts +2 -2
- package/dist/cjs/components/SimpleCell/SimpleCell.js.map +1 -1
- package/dist/cjs/components/SplitCol/SplitCol.d.ts +3 -3
- package/dist/cjs/components/SplitCol/SplitCol.js +2 -4
- package/dist/cjs/components/SplitCol/SplitCol.js.map +1 -1
- package/dist/cjs/components/SubnavigationBar/SubnavigationBar.d.ts +2 -1
- package/dist/cjs/components/SubnavigationBar/SubnavigationBar.js +38 -11
- package/dist/cjs/components/SubnavigationBar/SubnavigationBar.js.map +1 -1
- package/dist/cjs/components/SubnavigationButton/SubnavigationButton.js.map +1 -1
- package/dist/cjs/components/Switch/Switch.d.ts +2 -3
- package/dist/cjs/components/Switch/Switch.js +18 -8
- package/dist/cjs/components/Switch/Switch.js.map +1 -1
- package/dist/cjs/components/Tabbar/Tabbar.js +3 -1
- package/dist/cjs/components/Tabbar/Tabbar.js.map +1 -1
- package/dist/cjs/components/TabbarItem/TabbarItem.d.ts +3 -1
- package/dist/cjs/components/TabbarItem/TabbarItem.js +29 -11
- package/dist/cjs/components/TabbarItem/TabbarItem.js.map +1 -1
- package/dist/cjs/components/Tappable/Tappable.d.ts +2 -3
- package/dist/cjs/components/Tappable/Tappable.js.map +1 -1
- package/dist/cjs/components/Textarea/Textarea.js +9 -7
- package/dist/cjs/components/Textarea/Textarea.js.map +1 -1
- package/dist/cjs/components/Touch/Touch.d.ts +16 -17
- package/dist/cjs/components/Touch/Touch.js +21 -7
- package/dist/cjs/components/Touch/Touch.js.map +1 -1
- package/dist/cjs/components/Typography/Caption/Caption.d.ts +2 -2
- package/dist/cjs/components/Typography/Caption/Caption.js +4 -2
- package/dist/cjs/components/Typography/Caption/Caption.js.map +1 -1
- package/dist/cjs/components/Typography/Headline/Headline.d.ts +2 -2
- package/dist/cjs/components/Typography/Headline/Headline.js +2 -1
- package/dist/cjs/components/Typography/Headline/Headline.js.map +1 -1
- package/dist/cjs/components/Typography/Subhead/Subhead.d.ts +2 -2
- package/dist/cjs/components/Typography/Subhead/Subhead.js +2 -1
- package/dist/cjs/components/Typography/Subhead/Subhead.js.map +1 -1
- package/dist/cjs/components/Typography/Text/Text.d.ts +2 -3
- package/dist/cjs/components/Typography/Text/Text.js +2 -1
- package/dist/cjs/components/Typography/Text/Text.js.map +1 -1
- package/dist/cjs/components/Typography/Title/Title.d.ts +2 -2
- package/dist/cjs/components/Typography/Title/Title.js +9 -4
- package/dist/cjs/components/Typography/Title/Title.js.map +1 -1
- package/dist/cjs/components/View/View.js +68 -75
- package/dist/cjs/components/View/View.js.map +1 -1
- package/dist/cjs/components/View/ViewInfinite.js +78 -85
- package/dist/cjs/components/View/ViewInfinite.js.map +1 -1
- package/dist/cjs/components/View/utils.d.ts +2 -0
- package/dist/cjs/components/View/utils.js +13 -0
- package/dist/cjs/components/View/utils.js.map +1 -0
- package/dist/cjs/index.d.ts +4 -0
- package/dist/cjs/index.js +16 -0
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/lib/accessibility.d.ts +1 -1
- package/dist/cjs/lib/accessibility.js.map +1 -1
- package/dist/cjs/lib/prefixClass.js +7 -6
- package/dist/cjs/lib/prefixClass.js.map +1 -1
- package/dist/cjs/lib/supportEvents.d.ts +3 -1
- package/dist/cjs/lib/supportEvents.js +1 -4
- package/dist/cjs/lib/supportEvents.js.map +1 -1
- package/dist/cjs/types.d.ts +3 -0
- package/dist/components/ActionSheet/ActionSheet.js +6 -9
- package/dist/components/ActionSheet/ActionSheet.js.map +1 -1
- package/dist/components/Avatar/Avatar.d.ts +2 -0
- package/dist/components/Avatar/Avatar.js +4 -2
- package/dist/components/Avatar/Avatar.js.map +1 -1
- package/dist/components/Banner/Banner.js.map +1 -1
- package/dist/components/Button/Button.js.map +1 -1
- package/dist/components/CardScroll/CardScroll.js +1 -1
- package/dist/components/CardScroll/CardScroll.js.map +1 -1
- package/dist/components/Cell/Cell.d.ts +11 -0
- package/dist/components/Cell/Cell.js +103 -177
- package/dist/components/Cell/Cell.js.map +1 -1
- package/dist/components/Cell/CellCheckbox/CellCheckbox.d.ts +5 -0
- package/dist/components/Cell/CellCheckbox/CellCheckbox.js +31 -0
- package/dist/components/Cell/CellCheckbox/CellCheckbox.js.map +1 -0
- package/dist/components/Cell/CellDragger/CellDragger.d.ts +6 -0
- package/dist/components/Cell/CellDragger/CellDragger.js +30 -0
- package/dist/components/Cell/CellDragger/CellDragger.js.map +1 -0
- package/dist/components/Cell/useDraggable.d.ts +13 -0
- package/dist/components/Cell/useDraggable.js +126 -0
- package/dist/components/Cell/useDraggable.js.map +1 -0
- package/dist/components/ChipsSelect/ChipsSelect.js +2 -2
- package/dist/components/ChipsSelect/ChipsSelect.js.map +1 -1
- package/dist/components/Counter/Counter.js.map +1 -1
- package/dist/components/CustomSelect/CustomSelect.d.ts +0 -1
- package/dist/components/CustomSelect/CustomSelect.js +3 -5
- package/dist/components/CustomSelect/CustomSelect.js.map +1 -1
- package/dist/components/DropdownIcon/DropdownIcon.d.ts +3 -0
- package/dist/components/DropdownIcon/DropdownIcon.js +19 -0
- package/dist/components/DropdownIcon/DropdownIcon.js.map +1 -0
- package/dist/components/FocusTrap/FocusTrap.d.ts +2 -3
- package/dist/components/FocusTrap/FocusTrap.js +3 -5
- package/dist/components/FocusTrap/FocusTrap.js.map +1 -1
- package/dist/components/FormField/FormField.d.ts +2 -3
- package/dist/components/FormField/FormField.js.map +1 -1
- package/dist/components/FormItem/FormItem.d.ts +2 -3
- package/dist/components/FormItem/FormItem.js.map +1 -1
- package/dist/components/FormLayout/FormLayout.d.ts +2 -4
- package/dist/components/FormLayout/FormLayout.js.map +1 -1
- package/dist/components/FormLayoutGroup/FormLayoutGroup.js +1 -0
- package/dist/components/FormLayoutGroup/FormLayoutGroup.js.map +1 -1
- package/dist/components/GridAvatar/GridAvatar.d.ts +9 -0
- package/dist/components/GridAvatar/GridAvatar.js +41 -0
- package/dist/components/GridAvatar/GridAvatar.js.map +1 -0
- package/dist/components/Header/Header.js.map +1 -1
- package/dist/components/HorizontalCell/HorizontalCell.d.ts +2 -3
- package/dist/components/HorizontalCell/HorizontalCell.js.map +1 -1
- package/dist/components/HorizontalScroll/HorizontalScroll.d.ts +3 -2
- package/dist/components/HorizontalScroll/HorizontalScroll.js +10 -12
- package/dist/components/HorizontalScroll/HorizontalScroll.js.map +1 -1
- package/dist/components/InitialsAvatar/InitialsAvatar.d.ts +33 -0
- package/dist/components/InitialsAvatar/InitialsAvatar.js +46 -0
- package/dist/components/InitialsAvatar/InitialsAvatar.js.map +1 -0
- package/dist/components/Link/Link.d.ts +1 -2
- package/dist/components/Link/Link.js.map +1 -1
- package/dist/components/ModalRoot/ModalRoot.js +167 -376
- package/dist/components/ModalRoot/ModalRoot.js.map +1 -1
- package/dist/components/ModalRoot/ModalRootContext.js +0 -3
- package/dist/components/ModalRoot/ModalRootContext.js.map +1 -1
- package/dist/components/ModalRoot/ModalRootDesktop.js +58 -244
- package/dist/components/ModalRoot/ModalRootDesktop.js.map +1 -1
- package/dist/components/ModalRoot/types.d.ts +0 -1
- package/dist/components/ModalRoot/types.js.map +1 -1
- package/dist/components/ModalRoot/useModalManager.d.ts +37 -0
- package/dist/components/ModalRoot/useModalManager.js +189 -0
- package/dist/components/ModalRoot/useModalManager.js.map +1 -0
- package/dist/components/NativeSelect/NativeSelect.js +2 -2
- package/dist/components/NativeSelect/NativeSelect.js.map +1 -1
- package/dist/components/Removable/Removable.d.ts +2 -1
- package/dist/components/Removable/Removable.js +73 -64
- package/dist/components/Removable/Removable.js.map +1 -1
- package/dist/components/SelectMimicry/SelectMimicry.js +2 -2
- package/dist/components/SelectMimicry/SelectMimicry.js.map +1 -1
- package/dist/components/SimpleCell/SimpleCell.d.ts +2 -2
- package/dist/components/SimpleCell/SimpleCell.js.map +1 -1
- package/dist/components/SplitCol/SplitCol.d.ts +3 -3
- package/dist/components/SplitCol/SplitCol.js +2 -4
- package/dist/components/SplitCol/SplitCol.js.map +1 -1
- package/dist/components/SubnavigationBar/SubnavigationBar.d.ts +2 -1
- package/dist/components/SubnavigationBar/SubnavigationBar.js +38 -11
- package/dist/components/SubnavigationBar/SubnavigationBar.js.map +1 -1
- package/dist/components/SubnavigationButton/SubnavigationButton.js.map +1 -1
- package/dist/components/Switch/Switch.d.ts +2 -3
- package/dist/components/Switch/Switch.js +15 -8
- package/dist/components/Switch/Switch.js.map +1 -1
- package/dist/components/Tabbar/Tabbar.js +3 -1
- package/dist/components/Tabbar/Tabbar.js.map +1 -1
- package/dist/components/TabbarItem/TabbarItem.d.ts +3 -1
- package/dist/components/TabbarItem/TabbarItem.js +26 -10
- package/dist/components/TabbarItem/TabbarItem.js.map +1 -1
- package/dist/components/Tappable/Tappable.d.ts +2 -3
- package/dist/components/Tappable/Tappable.js.map +1 -1
- package/dist/components/Textarea/Textarea.js +9 -6
- package/dist/components/Textarea/Textarea.js.map +1 -1
- package/dist/components/Touch/Touch.d.ts +16 -17
- package/dist/components/Touch/Touch.js +21 -7
- package/dist/components/Touch/Touch.js.map +1 -1
- package/dist/components/Typography/Caption/Caption.d.ts +2 -2
- package/dist/components/Typography/Caption/Caption.js +4 -2
- package/dist/components/Typography/Caption/Caption.js.map +1 -1
- package/dist/components/Typography/Headline/Headline.d.ts +2 -2
- package/dist/components/Typography/Headline/Headline.js +2 -1
- package/dist/components/Typography/Headline/Headline.js.map +1 -1
- package/dist/components/Typography/Subhead/Subhead.d.ts +2 -2
- package/dist/components/Typography/Subhead/Subhead.js +2 -1
- package/dist/components/Typography/Subhead/Subhead.js.map +1 -1
- package/dist/components/Typography/Text/Text.d.ts +2 -3
- package/dist/components/Typography/Text/Text.js +2 -1
- package/dist/components/Typography/Text/Text.js.map +1 -1
- package/dist/components/Typography/Title/Title.d.ts +2 -2
- package/dist/components/Typography/Title/Title.js +9 -4
- package/dist/components/Typography/Title/Title.js.map +1 -1
- package/dist/components/View/View.js +67 -75
- package/dist/components/View/View.js.map +1 -1
- package/dist/components/View/ViewInfinite.js +79 -87
- package/dist/components/View/ViewInfinite.js.map +1 -1
- package/dist/components/View/utils.d.ts +2 -0
- package/dist/components/View/utils.js +6 -0
- package/dist/components/View/utils.js.map +1 -0
- package/dist/components.css +1 -1
- package/dist/components.css.map +1 -1
- package/dist/cssm/components/ActionSheet/ActionSheet.js +6 -9
- package/dist/cssm/components/ActionSheet/ActionSheet.js.map +1 -1
- package/dist/cssm/components/Avatar/Avatar.js +4 -2
- package/dist/cssm/components/Avatar/Avatar.js.map +1 -1
- package/dist/cssm/components/Banner/Banner.js.map +1 -1
- package/dist/cssm/components/Button/Button.css +1 -1
- package/dist/cssm/components/Button/Button.js.map +1 -1
- package/dist/cssm/components/CardScroll/CardScroll.js +1 -1
- package/dist/cssm/components/CardScroll/CardScroll.js.map +1 -1
- package/dist/cssm/components/Cell/Cell.css +1 -1
- package/dist/cssm/components/Cell/Cell.js +103 -177
- package/dist/cssm/components/Cell/Cell.js.map +1 -1
- package/dist/cssm/components/Cell/CellCheckbox/CellCheckbox.css +1 -0
- package/dist/cssm/components/Cell/CellCheckbox/CellCheckbox.js +32 -0
- package/dist/cssm/components/Cell/CellCheckbox/CellCheckbox.js.map +1 -0
- package/dist/cssm/components/Cell/CellDragger/CellDragger.css +1 -0
- package/dist/cssm/components/Cell/CellDragger/CellDragger.js +31 -0
- package/dist/cssm/components/Cell/CellDragger/CellDragger.js.map +1 -0
- package/dist/cssm/components/Cell/useDraggable.js +126 -0
- package/dist/cssm/components/Cell/useDraggable.js.map +1 -0
- package/dist/cssm/components/ChipsSelect/ChipsSelect.js +2 -2
- package/dist/cssm/components/ChipsSelect/ChipsSelect.js.map +1 -1
- package/dist/cssm/components/Counter/Counter.js.map +1 -1
- package/dist/cssm/components/CustomSelect/CustomSelect.js +3 -5
- package/dist/cssm/components/CustomSelect/CustomSelect.js.map +1 -1
- package/dist/cssm/components/DropdownIcon/DropdownIcon.css +1 -0
- package/dist/cssm/components/DropdownIcon/DropdownIcon.js +20 -0
- package/dist/cssm/components/DropdownIcon/DropdownIcon.js.map +1 -0
- package/dist/cssm/components/FocusTrap/FocusTrap.js +3 -5
- package/dist/cssm/components/FocusTrap/FocusTrap.js.map +1 -1
- package/dist/cssm/components/FocusVisible/FocusVisible.css +1 -1
- package/dist/cssm/components/FormField/FormField.css +1 -1
- package/dist/cssm/components/FormField/FormField.js.map +1 -1
- package/dist/cssm/components/FormItem/FormItem.css +1 -1
- package/dist/cssm/components/FormItem/FormItem.js.map +1 -1
- package/dist/cssm/components/FormLayout/FormLayout.js.map +1 -1
- package/dist/cssm/components/FormLayoutGroup/FormLayoutGroup.css +1 -1
- package/dist/cssm/components/FormLayoutGroup/FormLayoutGroup.js +1 -0
- package/dist/cssm/components/FormLayoutGroup/FormLayoutGroup.js.map +1 -1
- package/dist/cssm/components/Gallery/Gallery.css +1 -1
- package/dist/cssm/components/GridAvatar/GridAvatar.css +1 -0
- package/dist/cssm/components/GridAvatar/GridAvatar.js +42 -0
- package/dist/cssm/components/GridAvatar/GridAvatar.js.map +1 -0
- package/dist/cssm/components/Header/Header.js.map +1 -1
- package/dist/cssm/components/HorizontalCell/HorizontalCell.js.map +1 -1
- package/dist/cssm/components/HorizontalScroll/HorizontalScroll.js +10 -12
- package/dist/cssm/components/HorizontalScroll/HorizontalScroll.js.map +1 -1
- package/dist/cssm/components/HorizontalScroll/HorizontalScrollArrow.css +1 -1
- package/dist/cssm/components/IconButton/IconButton.css +1 -1
- package/dist/cssm/components/InitialsAvatar/InitialsAvatar.css +1 -0
- package/dist/cssm/components/InitialsAvatar/InitialsAvatar.js +52 -0
- package/dist/cssm/components/InitialsAvatar/InitialsAvatar.js.map +1 -0
- package/dist/cssm/components/Link/Link.js.map +1 -1
- package/dist/cssm/components/ModalRoot/ModalRoot.js +167 -376
- package/dist/cssm/components/ModalRoot/ModalRoot.js.map +1 -1
- package/dist/cssm/components/ModalRoot/ModalRootContext.js +0 -3
- package/dist/cssm/components/ModalRoot/ModalRootContext.js.map +1 -1
- package/dist/cssm/components/ModalRoot/ModalRootDesktop.js +58 -244
- package/dist/cssm/components/ModalRoot/ModalRootDesktop.js.map +1 -1
- package/dist/cssm/components/ModalRoot/types.js.map +1 -1
- package/dist/cssm/components/ModalRoot/useModalManager.js +189 -0
- package/dist/cssm/components/ModalRoot/useModalManager.js.map +1 -0
- package/dist/cssm/components/NativeSelect/NativeSelect.js +2 -2
- package/dist/cssm/components/NativeSelect/NativeSelect.js.map +1 -1
- package/dist/cssm/components/Removable/Removable.css +1 -1
- package/dist/cssm/components/Removable/Removable.js +73 -64
- package/dist/cssm/components/Removable/Removable.js.map +1 -1
- package/dist/cssm/components/Search/Search.css +1 -1
- package/dist/cssm/components/Select/Select.css +1 -1
- package/dist/cssm/components/SelectMimicry/SelectMimicry.js +2 -2
- package/dist/cssm/components/SelectMimicry/SelectMimicry.js.map +1 -1
- package/dist/cssm/components/SimpleCell/SimpleCell.css +1 -1
- package/dist/cssm/components/SimpleCell/SimpleCell.js.map +1 -1
- package/dist/cssm/components/SplitCol/SplitCol.js +2 -4
- package/dist/cssm/components/SplitCol/SplitCol.js.map +1 -1
- package/dist/cssm/components/SubnavigationBar/SubnavigationBar.js +38 -11
- package/dist/cssm/components/SubnavigationBar/SubnavigationBar.js.map +1 -1
- package/dist/cssm/components/SubnavigationButton/SubnavigationButton.js.map +1 -1
- package/dist/cssm/components/Switch/Switch.css +1 -1
- package/dist/cssm/components/Switch/Switch.js +15 -8
- package/dist/cssm/components/Switch/Switch.js.map +1 -1
- package/dist/cssm/components/Tabbar/Tabbar.css +1 -1
- package/dist/cssm/components/Tabbar/Tabbar.js +3 -1
- package/dist/cssm/components/Tabbar/Tabbar.js.map +1 -1
- package/dist/cssm/components/TabbarItem/TabbarItem.css +1 -1
- package/dist/cssm/components/TabbarItem/TabbarItem.js +26 -10
- package/dist/cssm/components/TabbarItem/TabbarItem.js.map +1 -1
- package/dist/cssm/components/Tappable/Tappable.js.map +1 -1
- package/dist/cssm/components/Textarea/Textarea.js +9 -6
- package/dist/cssm/components/Textarea/Textarea.js.map +1 -1
- package/dist/cssm/components/Touch/Touch.js +21 -7
- package/dist/cssm/components/Touch/Touch.js.map +1 -1
- package/dist/cssm/components/Typography/Caption/Caption.js +4 -2
- package/dist/cssm/components/Typography/Caption/Caption.js.map +1 -1
- package/dist/cssm/components/Typography/Headline/Headline.js +2 -1
- package/dist/cssm/components/Typography/Headline/Headline.js.map +1 -1
- package/dist/cssm/components/Typography/Subhead/Subhead.js +2 -1
- package/dist/cssm/components/Typography/Subhead/Subhead.js.map +1 -1
- package/dist/cssm/components/Typography/Text/Text.js +2 -1
- package/dist/cssm/components/Typography/Text/Text.js.map +1 -1
- package/dist/cssm/components/Typography/Title/Title.js +9 -4
- package/dist/cssm/components/Typography/Title/Title.js.map +1 -1
- package/dist/cssm/components/View/View.js +67 -75
- package/dist/cssm/components/View/View.js.map +1 -1
- package/dist/cssm/components/View/ViewInfinite.js +79 -87
- package/dist/cssm/components/View/ViewInfinite.js.map +1 -1
- package/dist/cssm/components/View/utils.js +6 -0
- package/dist/cssm/components/View/utils.js.map +1 -0
- package/dist/cssm/index.js +2 -0
- package/dist/cssm/index.js.map +1 -1
- package/dist/cssm/lib/accessibility.js.map +1 -1
- package/dist/cssm/lib/prefixClass.js +7 -6
- package/dist/cssm/lib/prefixClass.js.map +1 -1
- package/dist/cssm/lib/supportEvents.js +1 -4
- package/dist/cssm/lib/supportEvents.js.map +1 -1
- package/dist/cssm/styles/components.css +1 -1
- package/dist/cssm/styles/themes.css +1 -1
- package/dist/cssm/styles/vkcom_light.css +1 -1
- package/dist/index.d.ts +4 -0
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/lib/accessibility.d.ts +1 -1
- package/dist/lib/accessibility.js.map +1 -1
- package/dist/lib/prefixClass.js +7 -6
- package/dist/lib/prefixClass.js.map +1 -1
- package/dist/lib/supportEvents.d.ts +3 -1
- package/dist/lib/supportEvents.js +1 -4
- package/dist/lib/supportEvents.js.map +1 -1
- package/dist/types.d.ts +3 -0
- package/dist/vkui.css +2 -2
- package/dist/vkui.css.map +1 -1
- package/package.json +8 -4
- package/src/components/ActionSheet/ActionSheet.tsx +4 -5
- package/src/components/ActionSheet/Readme.md +18 -14
- package/src/components/Alert/Readme.md +15 -11
- package/src/components/Avatar/Avatar.tsx +5 -2
- package/src/components/Banner/Banner.tsx +4 -5
- package/src/components/Button/Button.css +26 -53
- package/src/components/Button/Button.tsx +2 -3
- package/src/components/Card/Readme.md +6 -6
- package/src/components/CardScroll/CardScroll.tsx +4 -1
- package/src/components/Cell/Cell.css +21 -58
- package/src/components/Cell/Cell.tsx +101 -162
- package/src/components/Cell/CellCheckbox/CellCheckbox.css +17 -0
- package/src/components/Cell/CellCheckbox/CellCheckbox.tsx +42 -0
- package/src/components/Cell/CellDragger/CellDragger.css +4 -0
- package/src/components/Cell/CellDragger/CellDragger.tsx +40 -0
- package/src/components/Cell/Readme.md +89 -51
- package/src/components/Cell/useDraggable.tsx +112 -0
- package/src/components/ChipsSelect/ChipsSelect.tsx +2 -2
- package/src/components/Counter/Counter.tsx +2 -2
- package/src/components/CustomSelect/CustomSelect.tsx +3 -4
- package/src/components/DropdownIcon/DropdownIcon.css +3 -0
- package/src/components/DropdownIcon/DropdownIcon.tsx +20 -0
- package/src/components/Epic/Readme.md +2 -1
- package/src/components/FocusTrap/FocusTrap.tsx +13 -11
- package/src/components/FocusVisible/FocusVisible.css +12 -4
- package/src/components/FormField/FormField.css +0 -1
- package/src/components/FormField/FormField.tsx +2 -2
- package/src/components/FormItem/FormItem.css +13 -14
- package/src/components/FormItem/FormItem.tsx +2 -3
- package/src/components/FormLayout/FormLayout.tsx +2 -4
- package/src/components/FormLayoutGroup/FormLayoutGroup.css +11 -7
- package/src/components/FormLayoutGroup/FormLayoutGroup.tsx +10 -1
- package/src/components/Gallery/Gallery.css +2 -3
- package/src/components/Gallery/Readme.md +89 -109
- package/src/components/GridAvatar/GridAvatar.css +37 -0
- package/src/components/GridAvatar/GridAvatar.tsx +55 -0
- package/src/components/GridAvatar/Readme.md +12 -0
- package/src/components/Group/Readme.md +18 -14
- package/src/components/Header/Header.tsx +4 -4
- package/src/components/HorizontalCell/HorizontalCell.tsx +3 -3
- package/src/components/HorizontalScroll/HorizontalScroll.tsx +14 -18
- package/src/components/HorizontalScroll/HorizontalScrollArrow.css +2 -2
- package/src/components/IconButton/IconButton.css +7 -0
- package/src/components/InitialsAvatar/InitialsAvatar.css +53 -0
- package/src/components/InitialsAvatar/InitialsAvatar.tsx +90 -0
- package/src/components/InitialsAvatar/Readme.md +14 -0
- package/src/components/Link/Link.tsx +1 -1
- package/src/components/MiniInfoCell/Readme.md +66 -62
- package/src/components/ModalDismissButton/Readme.md +13 -10
- package/src/components/ModalRoot/ModalRoot.tsx +159 -349
- package/src/components/ModalRoot/ModalRootContext.tsx +0 -1
- package/src/components/ModalRoot/ModalRootDesktop.tsx +54 -240
- package/src/components/ModalRoot/Readme.md +35 -27
- package/src/components/ModalRoot/types.ts +0 -1
- package/src/components/ModalRoot/useModalManager.tsx +174 -0
- package/src/components/NativeSelect/NativeSelect.tsx +2 -2
- package/src/components/Removable/Removable.css +16 -63
- package/src/components/Removable/Removable.tsx +84 -64
- package/src/components/ScreenSpinner/Readme.md +13 -9
- package/src/components/Search/Search.css +1 -1
- package/src/components/Select/Select.css +1 -1
- package/src/components/SelectMimicry/SelectMimicry.tsx +2 -2
- package/src/components/SimpleCell/SimpleCell.css +10 -18
- package/src/components/SimpleCell/SimpleCell.tsx +3 -5
- package/src/components/SplitCol/SplitCol.tsx +4 -8
- package/src/components/SplitLayout/Readme.md +2 -2
- package/src/components/SubnavigationBar/Readme.md +90 -86
- package/src/components/SubnavigationBar/SubnavigationBar.tsx +32 -14
- package/src/components/SubnavigationButton/SubnavigationButton.tsx +2 -3
- package/src/components/Switch/Readme.md +6 -6
- package/src/components/Switch/Switch.css +46 -15
- package/src/components/Switch/Switch.tsx +16 -8
- package/src/components/Tabbar/Tabbar.css +15 -4
- package/src/components/Tabbar/Tabbar.tsx +3 -1
- package/src/components/TabbarItem/Readme.md +72 -0
- package/src/components/TabbarItem/TabbarItem.css +65 -14
- package/src/components/TabbarItem/TabbarItem.tsx +46 -22
- package/src/components/Tappable/Tappable.tsx +2 -3
- package/src/components/Textarea/Readme.md +3 -0
- package/src/components/Textarea/Textarea.tsx +10 -6
- package/src/components/Touch/Touch.tsx +38 -25
- package/src/components/Typography/Caption/Caption.tsx +4 -4
- package/src/components/Typography/Headline/Headline.tsx +3 -3
- package/src/components/Typography/Subhead/Subhead.tsx +3 -3
- package/src/components/Typography/Text/Text.tsx +3 -4
- package/src/components/Typography/Title/Title.tsx +9 -5
- package/src/components/View/Readme.md +42 -56
- package/src/components/View/View.tsx +46 -61
- package/src/components/View/ViewInfinite.tsx +52 -67
- package/src/components/View/utils.ts +8 -0
- package/src/index.ts +4 -0
- package/src/lib/accessibility.ts +2 -2
- package/src/lib/prefixClass.ts +9 -6
- package/src/lib/supportEvents.ts +1 -4
- package/src/styles/components.css +4 -0
- package/src/styles/vkcom_light.css +3 -3
- package/src/testing/utils.tsx +34 -1
- package/src/types.ts +4 -0
|
@@ -11,8 +11,6 @@ exports.ModalRootDesktop = void 0;
|
|
|
11
11
|
|
|
12
12
|
var _jsxRuntime = require("../../lib/jsxRuntime");
|
|
13
13
|
|
|
14
|
-
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
15
|
-
|
|
16
14
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
17
15
|
|
|
18
16
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
@@ -31,8 +29,6 @@ var React = _interopRequireWildcard(require("react"));
|
|
|
31
29
|
|
|
32
30
|
var _classNames = require("../../lib/classNames");
|
|
33
31
|
|
|
34
|
-
var _utils = require("../../lib/utils");
|
|
35
|
-
|
|
36
32
|
var _supportEvents = require("../../lib/supportEvents");
|
|
37
33
|
|
|
38
34
|
var _withPlatform = require("../../hoc/withPlatform");
|
|
@@ -43,8 +39,6 @@ var _ModalRootContext = _interopRequireDefault(require("./ModalRootContext"));
|
|
|
43
39
|
|
|
44
40
|
var _ConfigProviderContext = require("../ConfigProvider/ConfigProviderContext");
|
|
45
41
|
|
|
46
|
-
var _types = require("./types");
|
|
47
|
-
|
|
48
42
|
var _platform = require("../../lib/platform");
|
|
49
43
|
|
|
50
44
|
var _getClassName = require("../../helpers/getClassName");
|
|
@@ -57,9 +51,10 @@ var _warnOnce = require("../../lib/warnOnce");
|
|
|
57
51
|
|
|
58
52
|
var _FocusTrap = require("../FocusTrap/FocusTrap");
|
|
59
53
|
|
|
54
|
+
var _useModalManager = require("./useModalManager");
|
|
55
|
+
|
|
60
56
|
var _excluded = ["id"];
|
|
61
57
|
var warn = (0, _warnOnce.warnOnce)('ModalRoot');
|
|
62
|
-
var IS_DEV = process.env.NODE_ENV === 'development';
|
|
63
58
|
|
|
64
59
|
var ModalRootDesktopComponent = /*#__PURE__*/function (_React$Component) {
|
|
65
60
|
(0, _inherits2.default)(ModalRootDesktopComponent, _React$Component);
|
|
@@ -71,72 +66,11 @@ var ModalRootDesktopComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
71
66
|
|
|
72
67
|
(0, _classCallCheck2.default)(this, ModalRootDesktopComponent);
|
|
73
68
|
_this = _super.call(this, props);
|
|
74
|
-
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "modalsState", void 0);
|
|
75
69
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "maskElementRef", void 0);
|
|
76
70
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "maskAnimationFrame", void 0);
|
|
77
71
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "modalRootContext", void 0);
|
|
78
72
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "restoreFocusTo", void 0);
|
|
79
|
-
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "activeTransitions", void 0);
|
|
80
|
-
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "prevNextSwitchEndHandler", function () {
|
|
81
|
-
_this.activeTransitions = Math.max(0, _this.activeTransitions - 1);
|
|
82
|
-
|
|
83
|
-
if (_this.activeTransitions > 0) {
|
|
84
|
-
return;
|
|
85
|
-
}
|
|
86
|
-
|
|
87
|
-
var activeModal = _this.state.nextModal;
|
|
88
|
-
var newState = {
|
|
89
|
-
prevModal: null,
|
|
90
|
-
nextModal: null,
|
|
91
|
-
visibleModals: [activeModal],
|
|
92
|
-
activeModal: activeModal,
|
|
93
|
-
animated: false,
|
|
94
|
-
switching: false
|
|
95
|
-
};
|
|
96
|
-
|
|
97
|
-
if (!activeModal) {
|
|
98
|
-
newState.history = [];
|
|
99
|
-
|
|
100
|
-
if (_this.restoreFocusTo) {
|
|
101
|
-
_this.restoreFocusTo.focus();
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
_this.setState(newState);
|
|
106
|
-
});
|
|
107
|
-
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "triggerActiveModalClose", function () {
|
|
108
|
-
var activeModalState = _this.modalsState[_this.state.activeModal];
|
|
109
|
-
|
|
110
|
-
if (activeModalState) {
|
|
111
|
-
_this.doCloseModal(activeModalState);
|
|
112
|
-
}
|
|
113
|
-
});
|
|
114
|
-
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "doCloseModal", function (modalState) {
|
|
115
|
-
if ((0, _utils.isFunction)(modalState.onClose)) {
|
|
116
|
-
modalState.onClose();
|
|
117
|
-
} else if ((0, _utils.isFunction)(_this.props.onClose)) {
|
|
118
|
-
_this.props.onClose(modalState.id);
|
|
119
|
-
} else if (IS_DEV) {
|
|
120
|
-
warn('onClose is undefined');
|
|
121
|
-
}
|
|
122
|
-
});
|
|
123
|
-
var _activeModal = props.activeModal;
|
|
124
|
-
_this.state = {
|
|
125
|
-
activeModal: null,
|
|
126
|
-
prevModal: null,
|
|
127
|
-
nextModal: _activeModal,
|
|
128
|
-
visibleModals: _activeModal ? [_activeModal] : [],
|
|
129
|
-
animated: !!_activeModal,
|
|
130
|
-
switching: false,
|
|
131
|
-
history: _activeModal ? [_activeModal] : [],
|
|
132
|
-
isBack: false,
|
|
133
|
-
inited: false
|
|
134
|
-
};
|
|
135
73
|
_this.maskElementRef = /*#__PURE__*/React.createRef();
|
|
136
|
-
_this.activeTransitions = 0;
|
|
137
|
-
|
|
138
|
-
_this.initModalsState();
|
|
139
|
-
|
|
140
74
|
_this.modalRootContext = {
|
|
141
75
|
updateModalHeight: function updateModalHeight() {
|
|
142
76
|
return undefined;
|
|
@@ -144,9 +78,11 @@ var ModalRootDesktopComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
144
78
|
registerModal: function registerModal(_ref) {
|
|
145
79
|
var id = _ref.id,
|
|
146
80
|
data = (0, _objectWithoutProperties2.default)(_ref, _excluded);
|
|
147
|
-
return Object.assign(_this.
|
|
81
|
+
return Object.assign(_this.getModalState(id), data);
|
|
82
|
+
},
|
|
83
|
+
onClose: function onClose() {
|
|
84
|
+
return _this.props.closeActiveModal();
|
|
148
85
|
},
|
|
149
|
-
onClose: _this.triggerActiveModalClose,
|
|
150
86
|
isInsideModal: true
|
|
151
87
|
};
|
|
152
88
|
return _this;
|
|
@@ -163,127 +99,64 @@ var ModalRootDesktopComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
163
99
|
return React.Children.toArray(this.props.children);
|
|
164
100
|
}
|
|
165
101
|
}, {
|
|
166
|
-
key: "
|
|
167
|
-
value: function
|
|
168
|
-
|
|
169
|
-
var modalProps = Modal.props;
|
|
170
|
-
var state = {
|
|
171
|
-
id: (0, _getNavId.getNavId)(Modal.props, warn),
|
|
172
|
-
onClose: Modal.props.onClose,
|
|
173
|
-
dynamicContentHeight: !!modalProps.dynamicContentHeight
|
|
174
|
-
}; // ModalPage props
|
|
175
|
-
|
|
176
|
-
if (typeof modalProps.settlingHeight === 'number') {
|
|
177
|
-
state.settlingHeight = modalProps.settlingHeight;
|
|
178
|
-
}
|
|
179
|
-
|
|
180
|
-
acc[state.id] = state;
|
|
181
|
-
return acc;
|
|
182
|
-
}, {});
|
|
183
|
-
}
|
|
184
|
-
}, {
|
|
185
|
-
key: "componentDidMount",
|
|
186
|
-
value: function componentDidMount() {
|
|
187
|
-
this.initActiveModal();
|
|
102
|
+
key: "getModalState",
|
|
103
|
+
value: function getModalState(id) {
|
|
104
|
+
return this.props.getModalState(id);
|
|
188
105
|
}
|
|
189
106
|
}, {
|
|
190
107
|
key: "componentDidUpdate",
|
|
191
|
-
value: function componentDidUpdate(prevProps
|
|
108
|
+
value: function componentDidUpdate(prevProps) {
|
|
192
109
|
var _this2 = this;
|
|
193
110
|
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
111
|
+
// transition phase 2: animate exiting modal
|
|
112
|
+
if (this.props.exitingModal && this.props.exitingModal !== prevProps.exitingModal) {
|
|
113
|
+
this.closeModal(this.props.exitingModal);
|
|
114
|
+
} // transition phase 3: animate entering modal
|
|
197
115
|
|
|
198
|
-
if (IS_DEV && nextModal !== null && !this.modalsState[nextModal]) {
|
|
199
|
-
return warn("[ModalRoot.componentDidUpdate] nextModal ".concat(nextModal, " not found"));
|
|
200
|
-
}
|
|
201
116
|
|
|
202
|
-
|
|
203
|
-
var
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
} else {
|
|
211
|
-
history.push(nextModal);
|
|
212
|
-
}
|
|
117
|
+
if (this.props.enteringModal && this.props.enteringModal !== prevProps.enteringModal) {
|
|
118
|
+
var enteringModal = this.props.enteringModal;
|
|
119
|
+
var enteringState = this.getModalState(enteringModal);
|
|
120
|
+
requestAnimationFrame(function () {
|
|
121
|
+
if (_this2.props.enteringModal === enteringModal) {
|
|
122
|
+
_this2.waitTransitionFinish(enteringState, function () {
|
|
123
|
+
return _this2.props.onEnter(enteringModal);
|
|
124
|
+
});
|
|
213
125
|
|
|
214
|
-
|
|
215
|
-
activeModal: null,
|
|
216
|
-
nextModal: nextModal,
|
|
217
|
-
prevModal: prevModal,
|
|
218
|
-
visibleModals: [nextModal, prevModal],
|
|
219
|
-
history: history,
|
|
220
|
-
isBack: isBack,
|
|
221
|
-
animated: true,
|
|
222
|
-
inited: false,
|
|
223
|
-
switching: false
|
|
224
|
-
}, function () {
|
|
225
|
-
if (nextModal === null) {
|
|
226
|
-
_this2.closeActiveModal();
|
|
227
|
-
} else {
|
|
228
|
-
_this2.initActiveModal();
|
|
126
|
+
_this2.animateModalOpacity(enteringState, true);
|
|
229
127
|
}
|
|
230
128
|
});
|
|
129
|
+
} // focus restoration
|
|
130
|
+
|
|
131
|
+
|
|
132
|
+
if (this.props.activeModal && !prevProps.activeModal) {
|
|
133
|
+
this.restoreFocusTo = this.props.document.activeElement;
|
|
231
134
|
}
|
|
232
135
|
|
|
233
|
-
if (this.
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
});
|
|
136
|
+
if (!this.props.activeModal && !this.props.exitingModal && this.restoreFocusTo) {
|
|
137
|
+
this.restoreFocusTo.focus();
|
|
138
|
+
this.restoreFocusTo = null;
|
|
237
139
|
}
|
|
238
140
|
}
|
|
239
|
-
/**
|
|
240
|
-
* Инициализирует модалку перед анимацией открытия
|
|
241
|
-
*/
|
|
242
|
-
|
|
243
141
|
}, {
|
|
244
|
-
key: "
|
|
245
|
-
value: function
|
|
246
|
-
var
|
|
247
|
-
|
|
248
|
-
if (!activeModal) {
|
|
249
|
-
return;
|
|
250
|
-
}
|
|
251
|
-
|
|
252
|
-
var modalState = this.modalsState[activeModal];
|
|
253
|
-
|
|
254
|
-
switch (modalState.type) {
|
|
255
|
-
case _types.ModalType.PAGE:
|
|
256
|
-
modalState.settlingHeight = modalState.settlingHeight || 75;
|
|
257
|
-
break;
|
|
142
|
+
key: "closeModal",
|
|
143
|
+
value: function closeModal(id) {
|
|
144
|
+
var _this3 = this;
|
|
258
145
|
|
|
259
|
-
|
|
260
|
-
break;
|
|
261
|
-
|
|
262
|
-
default:
|
|
263
|
-
if (IS_DEV) {
|
|
264
|
-
warn('[initActiveModal] modalState.type is unknown');
|
|
265
|
-
}
|
|
146
|
+
var prevModalState = this.getModalState(id);
|
|
266
147
|
|
|
148
|
+
if (!prevModalState) {
|
|
149
|
+
return;
|
|
267
150
|
}
|
|
268
151
|
|
|
269
|
-
this.
|
|
270
|
-
|
|
271
|
-
switching: true
|
|
152
|
+
this.waitTransitionFinish(prevModalState, function () {
|
|
153
|
+
return _this3.props.onExit(id);
|
|
272
154
|
});
|
|
273
|
-
|
|
274
|
-
}, {
|
|
275
|
-
key: "closeActiveModal",
|
|
276
|
-
value: function closeActiveModal() {
|
|
277
|
-
var prevModal = this.state.prevModal;
|
|
155
|
+
this.animateModalOpacity(prevModalState, false);
|
|
278
156
|
|
|
279
|
-
if (
|
|
280
|
-
|
|
157
|
+
if (!this.props.activeModal) {
|
|
158
|
+
this.setMaskOpacity(prevModalState, 0);
|
|
281
159
|
}
|
|
282
|
-
|
|
283
|
-
var prevModalState = this.modalsState[prevModal];
|
|
284
|
-
this.waitTransitionFinish(prevModalState, this.prevNextSwitchEndHandler);
|
|
285
|
-
this.animateModalOpacity(prevModalState, false);
|
|
286
|
-
this.setMaskOpacity(prevModalState, 0);
|
|
287
160
|
}
|
|
288
161
|
}, {
|
|
289
162
|
key: "waitTransitionFinish",
|
|
@@ -299,61 +172,12 @@ var ModalRootDesktopComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
299
172
|
setTimeout(eventHandler, this.timeout);
|
|
300
173
|
}
|
|
301
174
|
}
|
|
302
|
-
|
|
303
|
-
key: "switchPrevNext",
|
|
304
|
-
value: function switchPrevNext() {
|
|
305
|
-
var _this3 = this;
|
|
306
|
-
|
|
307
|
-
var _this$state = this.state,
|
|
308
|
-
prevModal = _this$state.prevModal,
|
|
309
|
-
nextModal = _this$state.nextModal;
|
|
310
|
-
var prevModalState = this.modalsState[prevModal];
|
|
311
|
-
var nextModalState = this.modalsState[nextModal];
|
|
312
|
-
|
|
313
|
-
if (IS_DEV && !prevModalState && !nextModalState) {
|
|
314
|
-
return warn("[switchPrevNext] prevModal is ".concat(prevModal, ", nextModal is ").concat(nextModal));
|
|
315
|
-
}
|
|
316
|
-
|
|
317
|
-
var prevIsCard = !!prevModalState && prevModalState.type === _types.ModalType.CARD;
|
|
318
|
-
var nextIsPage = !!nextModalState && nextModalState.type === _types.ModalType.PAGE;
|
|
319
|
-
var nextIsCard = !!nextModalState && nextModalState.type === _types.ModalType.CARD; // Ждём полного скрытия предыдущей модалки
|
|
320
|
-
|
|
321
|
-
if (prevModalState && (nextIsCard || prevIsCard && nextIsPage)) {
|
|
322
|
-
this.activeTransitions += 1;
|
|
323
|
-
this.waitTransitionFinish(prevModalState, function () {
|
|
324
|
-
_this3.waitTransitionFinish(nextModalState, _this3.prevNextSwitchEndHandler);
|
|
325
|
-
|
|
326
|
-
_this3.animateModalOpacity(nextModalState, true);
|
|
327
|
-
});
|
|
328
|
-
requestAnimationFrame(function () {
|
|
329
|
-
_this3.animateModalOpacity(prevModalState, false);
|
|
330
|
-
});
|
|
331
|
-
return;
|
|
332
|
-
}
|
|
333
|
-
|
|
334
|
-
if (prevModalState && nextIsPage) {
|
|
335
|
-
this.activeTransitions += 1;
|
|
336
|
-
this.waitTransitionFinish(prevModalState, this.prevNextSwitchEndHandler);
|
|
337
|
-
requestAnimationFrame(function () {
|
|
338
|
-
_this3.animateModalOpacity(prevModalState, false);
|
|
339
|
-
});
|
|
340
|
-
}
|
|
341
|
-
|
|
342
|
-
if (!prevModal && this.props.document.activeElement) {
|
|
343
|
-
this.restoreFocusTo = this.props.document.activeElement;
|
|
344
|
-
}
|
|
175
|
+
/* Анимирует сдивг модалки */
|
|
345
176
|
|
|
346
|
-
this.activeTransitions += 1;
|
|
347
|
-
this.waitTransitionFinish(nextModalState, this.prevNextSwitchEndHandler);
|
|
348
|
-
requestAnimationFrame(function () {
|
|
349
|
-
_this3.animateModalOpacity(nextModalState, true);
|
|
350
|
-
});
|
|
351
|
-
}
|
|
352
177
|
}, {
|
|
353
178
|
key: "animateModalOpacity",
|
|
354
|
-
value:
|
|
355
|
-
|
|
356
|
-
function animateModalOpacity(modalState, display) {
|
|
179
|
+
value: function animateModalOpacity(modalState, display) {
|
|
180
|
+
modalState.innerElement.style.transitionDelay = display && this.props.delayEnter ? "".concat(this.timeout, "ms") : null;
|
|
357
181
|
modalState.innerElement.style.opacity = display ? '1' : '0';
|
|
358
182
|
}
|
|
359
183
|
/* Устанавливает прозрачность для полупрозрачной подложки */
|
|
@@ -365,7 +189,7 @@ var ModalRootDesktopComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
365
189
|
|
|
366
190
|
var forceOpacity = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
|
|
367
191
|
|
|
368
|
-
if (forceOpacity === null && this.
|
|
192
|
+
if (forceOpacity === null && this.props.history[0] !== modalState.id) {
|
|
369
193
|
return;
|
|
370
194
|
}
|
|
371
195
|
|
|
@@ -379,23 +203,17 @@ var ModalRootDesktopComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
379
203
|
}
|
|
380
204
|
});
|
|
381
205
|
}
|
|
382
|
-
/**
|
|
383
|
-
* Закрывает текущую модалку
|
|
384
|
-
*/
|
|
385
|
-
|
|
386
206
|
}, {
|
|
387
207
|
key: "render",
|
|
388
208
|
value: function render() {
|
|
389
209
|
var _this5 = this;
|
|
390
210
|
|
|
391
|
-
var _this$
|
|
392
|
-
|
|
393
|
-
activeModal = _this$
|
|
394
|
-
|
|
395
|
-
visibleModals = _this$state2.visibleModals,
|
|
396
|
-
animated = _this$state2.animated;
|
|
211
|
+
var _this$props = this.props,
|
|
212
|
+
exitingModal = _this$props.exitingModal,
|
|
213
|
+
activeModal = _this$props.activeModal,
|
|
214
|
+
enteringModal = _this$props.enteringModal;
|
|
397
215
|
|
|
398
|
-
if (!activeModal && !
|
|
216
|
+
if (!activeModal && !exitingModal) {
|
|
399
217
|
return null;
|
|
400
218
|
}
|
|
401
219
|
|
|
@@ -407,27 +225,27 @@ var ModalRootDesktopComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
407
225
|
}, 'ModalRoot--desktop')
|
|
408
226
|
}, (0, _jsxRuntime.createScopedElement)("div", {
|
|
409
227
|
vkuiClass: "ModalRoot__mask",
|
|
410
|
-
|
|
411
|
-
|
|
228
|
+
ref: this.maskElementRef,
|
|
229
|
+
onClick: this.props.closeActiveModal
|
|
412
230
|
}), (0, _jsxRuntime.createScopedElement)("div", {
|
|
413
231
|
vkuiClass: "ModalRoot__viewport"
|
|
414
232
|
}, this.modals.map(function (Modal) {
|
|
415
233
|
var modalId = (0, _getNavId.getNavId)(Modal.props, warn);
|
|
416
234
|
|
|
417
|
-
if (
|
|
235
|
+
if (modalId !== activeModal && modalId !== exitingModal) {
|
|
418
236
|
return null;
|
|
419
237
|
}
|
|
420
238
|
|
|
421
239
|
var key = "modal-".concat(modalId);
|
|
422
240
|
return (0, _jsxRuntime.createScopedElement)(_FocusTrap.FocusTrap, {
|
|
423
241
|
restoreFocus: false,
|
|
424
|
-
onClose: _this5.
|
|
242
|
+
onClose: _this5.props.closeActiveModal,
|
|
425
243
|
timeout: _this5.timeout,
|
|
426
244
|
key: key,
|
|
427
245
|
vkuiClass: (0, _classNames.classNames)('ModalRoot__modal', {
|
|
428
|
-
'ModalRoot__modal--active': modalId === activeModal,
|
|
429
|
-
'ModalRoot__modal--prev': modalId ===
|
|
430
|
-
'ModalRoot__modal--next': modalId ===
|
|
246
|
+
'ModalRoot__modal--active': !exitingModal && !enteringModal && modalId === activeModal,
|
|
247
|
+
'ModalRoot__modal--prev': modalId === exitingModal,
|
|
248
|
+
'ModalRoot__modal--next': exitingModal && modalId === activeModal
|
|
431
249
|
})
|
|
432
250
|
}, Modal);
|
|
433
251
|
}))));
|
|
@@ -436,6 +254,6 @@ var ModalRootDesktopComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
436
254
|
return ModalRootDesktopComponent;
|
|
437
255
|
}(React.Component);
|
|
438
256
|
|
|
439
|
-
var ModalRootDesktop = (0, _withContext.withContext)((0, _withPlatform.withPlatform)((0, _dom.withDOM)(ModalRootDesktopComponent)), _ConfigProviderContext.ConfigProviderContext, 'configProvider');
|
|
257
|
+
var ModalRootDesktop = (0, _withContext.withContext)((0, _withPlatform.withPlatform)((0, _dom.withDOM)((0, _useModalManager.withModalManager)()(ModalRootDesktopComponent))), _ConfigProviderContext.ConfigProviderContext, 'configProvider');
|
|
440
258
|
exports.ModalRootDesktop = ModalRootDesktop;
|
|
441
259
|
//# sourceMappingURL=ModalRootDesktop.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/components/ModalRoot/ModalRootDesktop.tsx"],"names":["warn","IS_DEV","process","env","NODE_ENV","ModalRootDesktopComponent","props","activeTransitions","Math","max","activeModal","state","nextModal","newState","prevModal","visibleModals","animated","switching","history","restoreFocusTo","focus","setState","activeModalState","modalsState","doCloseModal","modalState","onClose","id","isBack","inited","maskElementRef","React","createRef","initModalsState","modalRootContext","updateModalHeight","undefined","registerModal","data","Object","assign","triggerActiveModalClose","isInsideModal","platform","ANDROID","VKCOM","Children","toArray","children","modals","reduce","acc","Modal","modalProps","dynamicContentHeight","settlingHeight","initActiveModal","prevProps","prevState","includes","splice","indexOf","push","closeActiveModal","requestAnimationFrame","switchPrevNext","type","ModalType","PAGE","CARD","prevModalState","waitTransitionFinish","prevNextSwitchEndHandler","animateModalOpacity","setMaskOpacity","eventHandler","transitionEvent","supported","onceHandler","innerElement","removeEventListener","name","addEventListener","setTimeout","timeout","nextModalState","prevIsCard","nextIsPage","nextIsCard","document","activeElement","display","style","opacity","forceOpacity","cancelAnimationFrame","maskAnimationFrame","current","translateY","translateYCurrent","min","toString","configProvider","webviewType","WebviewType","VKAPPS","map","modalId","key","Component","ModalRootDesktop","ConfigProviderContext"],"mappings":"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","sourcesContent":["import * as React from 'react';\nimport { classNames } from '../../lib/classNames';\nimport { isFunction } from '../../lib/utils';\nimport { transitionEvent } from '../../lib/supportEvents';\nimport { HasPlatform } from '../../types';\nimport { withPlatform } from '../../hoc/withPlatform';\nimport { withContext } from '../../hoc/withContext';\nimport ModalRootContext, { ModalRootContextInterface } from './ModalRootContext';\nimport {\n ConfigProviderContext,\n ConfigProviderContextInterface,\n WebviewType,\n} from '../ConfigProvider/ConfigProviderContext';\nimport { ModalsStateEntry, ModalType } from './types';\nimport { ANDROID, VKCOM } from '../../lib/platform';\nimport { getClassName } from '../../helpers/getClassName';\nimport { DOMProps, withDOM } from '../../lib/dom';\nimport { getNavId } from '../../lib/getNavId';\nimport { warnOnce } from '../../lib/warnOnce';\nimport { FocusTrap } from '../FocusTrap/FocusTrap';\nimport './ModalRoot.css';\n\nconst warn = warnOnce('ModalRoot');\nconst IS_DEV = process.env.NODE_ENV === 'development';\n\nexport interface ModalRootProps extends HasPlatform {\n activeModal?: string | null;\n /**\n * @ignore\n */\n configProvider?: ConfigProviderContextInterface;\n\n /**\n * Будет вызвано при закрытии активной модалки с её id\n */\n onClose?(modalId: string): void;\n}\n\ninterface ModalRootState {\n activeModal?: string;\n prevModal?: string;\n nextModal?: string;\n visibleModals?: string[];\n animated?: boolean;\n switching?: boolean;\n history?: string[];\n isBack?: boolean;\n inited?: boolean;\n}\n\nclass ModalRootDesktopComponent extends React.Component<ModalRootProps & DOMProps, ModalRootState> {\n constructor(props: ModalRootProps) {\n super(props);\n\n const activeModal = props.activeModal;\n\n this.state = {\n activeModal: null,\n prevModal: null,\n nextModal: activeModal,\n visibleModals: activeModal ? [activeModal] : [],\n animated: !!activeModal,\n switching: false,\n history: activeModal ? [activeModal] : [],\n isBack: false,\n inited: false,\n };\n\n this.maskElementRef = React.createRef();\n this.activeTransitions = 0;\n\n this.initModalsState();\n\n this.modalRootContext = {\n updateModalHeight: () => undefined,\n registerModal: ({ id, ...data }) => Object.assign(this.modalsState[id], data),\n onClose: this.triggerActiveModalClose,\n isInsideModal: true,\n };\n }\n\n private modalsState: { [id: string]: ModalsStateEntry };\n private readonly maskElementRef: React.RefObject<HTMLDivElement>;\n private maskAnimationFrame: number;\n private readonly modalRootContext: ModalRootContextInterface;\n private restoreFocusTo: HTMLElement;\n\n activeTransitions: number;\n\n get timeout() {\n return this.props.platform === ANDROID || this.props.platform === VKCOM ? 320 : 400;\n }\n\n get modals() {\n return React.Children.toArray(this.props.children) as React.ReactElement[];\n }\n\n initModalsState() {\n this.modalsState = this.modals.reduce<{ [id: string]: ModalsStateEntry }>((acc, Modal) => {\n const modalProps = Modal.props;\n const state: ModalsStateEntry = {\n id: getNavId(Modal.props, warn),\n onClose: Modal.props.onClose,\n dynamicContentHeight: !!modalProps.dynamicContentHeight,\n };\n\n // ModalPage props\n if (typeof modalProps.settlingHeight === 'number') {\n state.settlingHeight = modalProps.settlingHeight;\n }\n\n acc[state.id] = state;\n return acc;\n }, {});\n }\n\n componentDidMount() {\n this.initActiveModal();\n }\n\n componentDidUpdate(prevProps: ModalRootProps, prevState: ModalRootState) {\n if (this.props.activeModal !== prevProps.activeModal) {\n const nextModal = this.props.activeModal;\n const prevModal = prevProps.activeModal;\n\n if (IS_DEV && nextModal !== null && !this.modalsState[nextModal]) {\n return warn(`[ModalRoot.componentDidUpdate] nextModal ${nextModal} not found`);\n }\n\n let history = [...this.state.history];\n let isBack = false;\n\n if (nextModal === null) {\n history = [];\n } else if (history.includes(nextModal)) {\n history = history.splice(0, history.indexOf(nextModal) + 1);\n isBack = true;\n } else {\n history.push(nextModal);\n }\n\n return this.setState({\n activeModal: null,\n nextModal,\n prevModal,\n visibleModals: [nextModal, prevModal],\n history,\n isBack,\n animated: true,\n inited: false,\n switching: false,\n }, () => {\n if (nextModal === null) {\n this.closeActiveModal();\n } else {\n this.initActiveModal();\n }\n });\n }\n\n if (this.state.switching && !prevState.switching) {\n requestAnimationFrame(() => this.switchPrevNext());\n }\n }\n\n /**\n * Инициализирует модалку перед анимацией открытия\n */\n initActiveModal() {\n const activeModal = this.state.activeModal || this.state.nextModal;\n if (!activeModal) {\n return;\n }\n\n const modalState = this.modalsState[activeModal];\n\n switch (modalState.type) {\n case ModalType.PAGE:\n modalState.settlingHeight = modalState.settlingHeight || 75;\n break;\n\n case ModalType.CARD:\n break;\n\n default:\n if (IS_DEV) {\n warn('[initActiveModal] modalState.type is unknown');\n }\n }\n\n this.setState({ inited: true, switching: true });\n }\n\n closeActiveModal() {\n const { prevModal } = this.state;\n if (IS_DEV && !prevModal) {\n return warn(`[closeActiveModal] prevModal is ${prevModal}`);\n }\n\n const prevModalState = this.modalsState[prevModal];\n\n this.waitTransitionFinish(prevModalState, this.prevNextSwitchEndHandler);\n this.animateModalOpacity(prevModalState, false);\n this.setMaskOpacity(prevModalState, 0);\n }\n\n waitTransitionFinish(modalState: ModalsStateEntry, eventHandler: () => void) {\n if (transitionEvent.supported) {\n const onceHandler = () => {\n modalState.innerElement.removeEventListener(transitionEvent.name, onceHandler);\n eventHandler();\n };\n\n modalState.innerElement.addEventListener(transitionEvent.name, onceHandler);\n } else {\n setTimeout(eventHandler, this.timeout);\n }\n }\n\n switchPrevNext() {\n const { prevModal, nextModal } = this.state;\n\n const prevModalState = this.modalsState[prevModal];\n const nextModalState = this.modalsState[nextModal];\n\n if (IS_DEV && !prevModalState && !nextModalState) {\n return warn(`[switchPrevNext] prevModal is ${prevModal}, nextModal is ${nextModal}`);\n }\n\n const prevIsCard = !!prevModalState && prevModalState.type === ModalType.CARD;\n\n const nextIsPage = !!nextModalState && nextModalState.type === ModalType.PAGE;\n const nextIsCard = !!nextModalState && nextModalState.type === ModalType.CARD;\n\n // Ждём полного скрытия предыдущей модалки\n if (prevModalState && (nextIsCard || prevIsCard && nextIsPage)) {\n this.activeTransitions += 1;\n this.waitTransitionFinish(prevModalState, () => {\n this.waitTransitionFinish(nextModalState, this.prevNextSwitchEndHandler);\n this.animateModalOpacity(nextModalState, true);\n });\n\n requestAnimationFrame(() => {\n this.animateModalOpacity(prevModalState, false);\n });\n\n return;\n }\n\n if (prevModalState && nextIsPage) {\n this.activeTransitions += 1;\n this.waitTransitionFinish(prevModalState, this.prevNextSwitchEndHandler);\n requestAnimationFrame(() => {\n this.animateModalOpacity(prevModalState, false);\n });\n }\n\n if (!prevModal && this.props.document.activeElement) {\n this.restoreFocusTo = this.props.document.activeElement as HTMLElement;\n }\n\n this.activeTransitions += 1;\n this.waitTransitionFinish(nextModalState, this.prevNextSwitchEndHandler);\n requestAnimationFrame(() => {\n this.animateModalOpacity(nextModalState, true);\n });\n }\n\n prevNextSwitchEndHandler = () => {\n this.activeTransitions = Math.max(0, this.activeTransitions - 1);\n if (this.activeTransitions > 0) {\n return;\n }\n\n const activeModal = this.state.nextModal;\n\n const newState: ModalRootState = {\n prevModal: null,\n nextModal: null,\n visibleModals: [activeModal],\n activeModal: activeModal,\n animated: false,\n switching: false,\n };\n\n if (!activeModal) {\n newState.history = [];\n if (this.restoreFocusTo) {\n this.restoreFocusTo.focus();\n }\n }\n\n this.setState(newState);\n };\n\n /* Анимирует сдивг модалки */\n animateModalOpacity(modalState: ModalsStateEntry, display: boolean) {\n modalState.innerElement.style.opacity = display ? '1' : '0';\n }\n\n /* Устанавливает прозрачность для полупрозрачной подложки */\n setMaskOpacity(modalState: ModalsStateEntry, forceOpacity: number = null) {\n if (forceOpacity === null && this.state.history[0] !== modalState.id) {\n return;\n }\n\n cancelAnimationFrame(this.maskAnimationFrame);\n this.maskAnimationFrame = requestAnimationFrame(() => {\n if (this.maskElementRef.current) {\n const { translateY, translateYCurrent } = modalState;\n\n const opacity = forceOpacity === null ? 1 - (translateYCurrent - translateY) / (100 - translateY) || 0 : forceOpacity;\n this.maskElementRef.current.style.opacity = Math.max(0, Math.min(100, opacity)).toString();\n }\n });\n }\n\n /**\n * Закрывает текущую модалку\n */\n triggerActiveModalClose = () => {\n const activeModalState = this.modalsState[this.state.activeModal];\n if (activeModalState) {\n this.doCloseModal(activeModalState);\n }\n };\n\n private readonly doCloseModal = (modalState: ModalsStateEntry) => {\n if (isFunction(modalState.onClose)) {\n modalState.onClose();\n } else if (isFunction(this.props.onClose)) {\n this.props.onClose(modalState.id);\n } else if (IS_DEV) {\n warn('onClose is undefined');\n }\n };\n\n render() {\n const { prevModal, activeModal, nextModal, visibleModals, animated } = this.state;\n\n if (!activeModal && !prevModal && !nextModal && !animated) {\n return null;\n }\n\n return (\n <ModalRootContext.Provider value={this.modalRootContext}>\n <div\n vkuiClass={classNames(getClassName('ModalRoot', this.props.platform), {\n 'ModalRoot--vkapps': this.props.configProvider.webviewType === WebviewType.VKAPPS,\n }, 'ModalRoot--desktop')}\n >\n <div\n vkuiClass=\"ModalRoot__mask\"\n onClick={this.triggerActiveModalClose}\n ref={this.maskElementRef}\n />\n <div vkuiClass=\"ModalRoot__viewport\">\n {this.modals.map((Modal: React.ReactElement) => {\n const modalId = getNavId(Modal.props, warn);\n if (!visibleModals.includes(modalId)) {\n return null;\n }\n\n const key = `modal-${modalId}`;\n\n return (\n <FocusTrap\n restoreFocus={false}\n onClose={this.triggerActiveModalClose}\n timeout={this.timeout}\n key={key}\n vkuiClass={classNames('ModalRoot__modal', {\n 'ModalRoot__modal--active': modalId === activeModal,\n 'ModalRoot__modal--prev': modalId === prevModal,\n 'ModalRoot__modal--next': modalId === nextModal,\n })}\n >{Modal}</FocusTrap>\n );\n })}\n </div>\n </div>\n </ModalRootContext.Provider>\n );\n }\n}\n\nexport const ModalRootDesktop = withContext(withPlatform(withDOM<ModalRootProps>(ModalRootDesktopComponent)), ConfigProviderContext, 'configProvider');\n"],"file":"ModalRootDesktop.js"}
|
|
1
|
+
{"version":3,"sources":["../../../../src/components/ModalRoot/ModalRootDesktop.tsx"],"names":["warn","ModalRootDesktopComponent","props","maskElementRef","React","createRef","modalRootContext","updateModalHeight","undefined","registerModal","id","data","Object","assign","getModalState","onClose","closeActiveModal","isInsideModal","platform","ANDROID","VKCOM","Children","toArray","children","prevProps","exitingModal","closeModal","enteringModal","enteringState","requestAnimationFrame","waitTransitionFinish","onEnter","animateModalOpacity","activeModal","restoreFocusTo","document","activeElement","focus","prevModalState","onExit","setMaskOpacity","modalState","eventHandler","transitionEvent","supported","onceHandler","innerElement","removeEventListener","name","addEventListener","setTimeout","timeout","display","style","transitionDelay","delayEnter","opacity","forceOpacity","history","cancelAnimationFrame","maskAnimationFrame","current","translateY","translateYCurrent","Math","max","min","toString","configProvider","webviewType","WebviewType","VKAPPS","modals","map","Modal","modalId","key","Component","ModalRootDesktop","ConfigProviderContext"],"mappings":"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","sourcesContent":["import * as React from 'react';\nimport { classNames } from '../../lib/classNames';\nimport { transitionEvent } from '../../lib/supportEvents';\nimport { HasPlatform } from '../../types';\nimport { withPlatform } from '../../hoc/withPlatform';\nimport { withContext } from '../../hoc/withContext';\nimport ModalRootContext, { ModalRootContextInterface } from './ModalRootContext';\nimport {\n ConfigProviderContext,\n ConfigProviderContextInterface,\n WebviewType,\n} from '../ConfigProvider/ConfigProviderContext';\nimport { ModalsStateEntry } from './types';\nimport { ANDROID, VKCOM } from '../../lib/platform';\nimport { getClassName } from '../../helpers/getClassName';\nimport { DOMProps, withDOM } from '../../lib/dom';\nimport { getNavId } from '../../lib/getNavId';\nimport { warnOnce } from '../../lib/warnOnce';\nimport { FocusTrap } from '../FocusTrap/FocusTrap';\nimport { ModalTransitionProps, withModalManager } from './useModalManager';\nimport './ModalRoot.css';\n\nconst warn = warnOnce('ModalRoot');\n\nexport interface ModalRootProps extends HasPlatform {\n activeModal?: string | null;\n /**\n * @ignore\n */\n configProvider?: ConfigProviderContextInterface;\n\n /**\n * Будет вызвано при закрытии активной модалки с её id\n */\n onClose?(modalId: string): void;\n}\n\nclass ModalRootDesktopComponent extends React.Component<ModalRootProps & DOMProps & ModalTransitionProps> {\n constructor(props: ModalRootProps & ModalTransitionProps) {\n super(props);\n\n this.maskElementRef = React.createRef();\n\n this.modalRootContext = {\n updateModalHeight: () => undefined,\n registerModal: ({ id, ...data }) => Object.assign(this.getModalState(id), data),\n onClose: () => this.props.closeActiveModal(),\n isInsideModal: true,\n };\n }\n\n private readonly maskElementRef: React.RefObject<HTMLDivElement>;\n private maskAnimationFrame: number;\n private readonly modalRootContext: ModalRootContextInterface;\n private restoreFocusTo: HTMLElement;\n\n private get timeout() {\n return this.props.platform === ANDROID || this.props.platform === VKCOM ? 320 : 400;\n }\n\n private get modals() {\n return React.Children.toArray(this.props.children) as React.ReactElement[];\n }\n\n getModalState(id: string) {\n return this.props.getModalState(id);\n }\n\n componentDidUpdate(prevProps: ModalRootProps & ModalTransitionProps) {\n // transition phase 2: animate exiting modal\n if (this.props.exitingModal && this.props.exitingModal !== prevProps.exitingModal) {\n this.closeModal(this.props.exitingModal);\n }\n\n // transition phase 3: animate entering modal\n if (this.props.enteringModal && this.props.enteringModal !== prevProps.enteringModal) {\n const { enteringModal } = this.props;\n const enteringState = this.getModalState(enteringModal);\n requestAnimationFrame(() => {\n if (this.props.enteringModal === enteringModal) {\n this.waitTransitionFinish(enteringState, () => this.props.onEnter(enteringModal));\n this.animateModalOpacity(enteringState, true);\n }\n });\n }\n\n // focus restoration\n if (this.props.activeModal && !prevProps.activeModal) {\n this.restoreFocusTo = this.props.document.activeElement as HTMLElement;\n }\n if (!this.props.activeModal && !this.props.exitingModal && this.restoreFocusTo) {\n this.restoreFocusTo.focus();\n this.restoreFocusTo = null;\n }\n }\n\n closeModal(id: string) {\n const prevModalState = this.getModalState(id);\n if (!prevModalState) {\n return;\n }\n\n this.waitTransitionFinish(prevModalState, () => this.props.onExit(id));\n this.animateModalOpacity(prevModalState, false);\n if (!this.props.activeModal) {\n this.setMaskOpacity(prevModalState, 0);\n }\n }\n\n waitTransitionFinish(modalState: ModalsStateEntry, eventHandler: () => void) {\n if (transitionEvent.supported) {\n const onceHandler = () => {\n modalState.innerElement.removeEventListener(transitionEvent.name, onceHandler);\n eventHandler();\n };\n\n modalState.innerElement.addEventListener(transitionEvent.name, onceHandler);\n } else {\n setTimeout(eventHandler, this.timeout);\n }\n }\n\n /* Анимирует сдивг модалки */\n animateModalOpacity(modalState: ModalsStateEntry, display: boolean) {\n modalState.innerElement.style.transitionDelay = display && this.props.delayEnter ? `${this.timeout}ms` : null;\n modalState.innerElement.style.opacity = display ? '1' : '0';\n }\n\n /* Устанавливает прозрачность для полупрозрачной подложки */\n setMaskOpacity(modalState: ModalsStateEntry, forceOpacity: number = null) {\n if (forceOpacity === null && this.props.history[0] !== modalState.id) {\n return;\n }\n\n cancelAnimationFrame(this.maskAnimationFrame);\n this.maskAnimationFrame = requestAnimationFrame(() => {\n if (this.maskElementRef.current) {\n const { translateY, translateYCurrent } = modalState;\n\n const opacity = forceOpacity === null ? 1 - (translateYCurrent - translateY) / (100 - translateY) || 0 : forceOpacity;\n this.maskElementRef.current.style.opacity = Math.max(0, Math.min(100, opacity)).toString();\n }\n });\n }\n\n render() {\n const { exitingModal, activeModal, enteringModal } = this.props;\n\n if (!activeModal && !exitingModal) {\n return null;\n }\n\n return (\n <ModalRootContext.Provider value={this.modalRootContext}>\n <div\n vkuiClass={classNames(getClassName('ModalRoot', this.props.platform), {\n 'ModalRoot--vkapps': this.props.configProvider.webviewType === WebviewType.VKAPPS,\n }, 'ModalRoot--desktop')}\n >\n <div\n vkuiClass=\"ModalRoot__mask\"\n ref={this.maskElementRef}\n onClick={this.props.closeActiveModal}\n />\n <div vkuiClass=\"ModalRoot__viewport\">\n {this.modals.map((Modal: React.ReactElement) => {\n const modalId = getNavId(Modal.props, warn);\n if (modalId !== activeModal && modalId !== exitingModal) {\n return null;\n }\n\n const key = `modal-${modalId}`;\n\n return (\n <FocusTrap\n restoreFocus={false}\n onClose={this.props.closeActiveModal}\n timeout={this.timeout}\n key={key}\n vkuiClass={classNames('ModalRoot__modal', {\n 'ModalRoot__modal--active': !exitingModal && !enteringModal && modalId === activeModal,\n 'ModalRoot__modal--prev': modalId === exitingModal,\n 'ModalRoot__modal--next': exitingModal && modalId === activeModal,\n })}\n >{Modal}</FocusTrap>\n );\n })}\n </div>\n </div>\n </ModalRootContext.Provider>\n );\n }\n}\n\nexport const ModalRootDesktop = withContext(\n withPlatform(\n withDOM<ModalRootProps>(\n withModalManager()(ModalRootDesktopComponent),\n ),\n ),\n ConfigProviderContext, 'configProvider');\n"],"file":"ModalRootDesktop.js"}
|
|
@@ -11,7 +11,6 @@ export interface ModalElements {
|
|
|
11
11
|
innerElement?: HTMLElement | null;
|
|
12
12
|
headerElement?: HTMLElement | null;
|
|
13
13
|
contentElement?: HTMLElement | null;
|
|
14
|
-
footerElement?: HTMLElement | null;
|
|
15
14
|
}
|
|
16
15
|
export interface ModalsStateEntry extends ModalElements {
|
|
17
16
|
id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/components/ModalRoot/types.ts"],"names":["ModalType"],"mappings":";;;;;;IAAYA,S;;;WAAAA,S;AAAAA,EAAAA,S;AAAAA,EAAAA,S;GAAAA,S,yBAAAA,S","sourcesContent":["export enum ModalType {\n PAGE = 'page',\n CARD = 'card',\n}\n\nexport type TranslateRange = [number, number];\n\nexport type ModalsState = { [index: string]: ModalsStateEntry };\n\nexport interface ModalElements {\n modalElement?: HTMLElement | null;\n innerElement?: HTMLElement | null;\n headerElement?: HTMLElement | null;\n contentElement?: HTMLElement | null;\n
|
|
1
|
+
{"version":3,"sources":["../../../../src/components/ModalRoot/types.ts"],"names":["ModalType"],"mappings":";;;;;;IAAYA,S;;;WAAAA,S;AAAAA,EAAAA,S;AAAAA,EAAAA,S;GAAAA,S,yBAAAA,S","sourcesContent":["export enum ModalType {\n PAGE = 'page',\n CARD = 'card',\n}\n\nexport type TranslateRange = [number, number];\n\nexport type ModalsState = { [index: string]: ModalsStateEntry };\n\nexport interface ModalElements {\n modalElement?: HTMLElement | null;\n innerElement?: HTMLElement | null;\n headerElement?: HTMLElement | null;\n contentElement?: HTMLElement | null;\n}\n\nexport interface ModalsStateEntry extends ModalElements {\n id: string;\n onClose?: () => any;\n type?: ModalType;\n\n settlingHeight?: number;\n dynamicContentHeight?: boolean;\n expandable?: boolean;\n\n /**\n * Процент текущего сдвига модалки\n */\n translateY?: number;\n /**\n * Процент сдвига модалки в изначальном состоянии\n */\n translateYFrom?: number;\n /**\n * Процент сдвига модалки во время взаимодействия с ней (потянуть, чтобы открыть или закрыть)\n */\n translateYCurrent?: number;\n\n touchStartContentScrollTop?: number;\n touchMovePositive?: boolean | null;\n touchShiftYPercent?: number;\n\n expanded?: boolean;\n collapsed?: boolean;\n hidden?: boolean;\n\n contentScrolled?: boolean;\n contentScrollStopTimeout?: ReturnType<typeof setTimeout>;\n\n expandedRange?: TranslateRange;\n collapsedRange?: TranslateRange;\n hiddenRange?: TranslateRange;\n}\n"],"file":"types.js"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
import { ModalsStateEntry } from './types';
|
|
3
|
+
interface ModalTransitionState {
|
|
4
|
+
activeModal?: string;
|
|
5
|
+
enteringModal?: string;
|
|
6
|
+
exitingModal?: string;
|
|
7
|
+
history?: string[];
|
|
8
|
+
isBack?: boolean;
|
|
9
|
+
}
|
|
10
|
+
export interface ModalTransitionProps extends ModalTransitionState {
|
|
11
|
+
onEnter: (id: string) => void;
|
|
12
|
+
onExit: (id: string) => void;
|
|
13
|
+
getModalState: (id: string) => ModalsStateEntry;
|
|
14
|
+
closeActiveModal: VoidFunction;
|
|
15
|
+
delayEnter: boolean;
|
|
16
|
+
}
|
|
17
|
+
export declare function modalTransitionReducer(state: ModalTransitionState, action: {
|
|
18
|
+
type: 'setActive' | 'entered' | 'exited' | 'inited';
|
|
19
|
+
id: string;
|
|
20
|
+
}): ModalTransitionState;
|
|
21
|
+
/**
|
|
22
|
+
* Реализует переход модалок. При смене activeModal m1 -> m2:
|
|
23
|
+
* 1. activeModal: m1, exitingModal: null, enteringModal: null, триггер перехода
|
|
24
|
+
* 2. activeModal: m2, exitingModal: m1, enteringModal: null, рендерим m2 чтобы прошел init, начинаем анимацию выхода
|
|
25
|
+
* одновременный переход между ModalPage:
|
|
26
|
+
* 3a. activeModal: m2, exitingModal: m1, enteringModal: m2
|
|
27
|
+
* 4a. exitingModal и enteringModal переходят в null в порядке завершения анимации
|
|
28
|
+
* ИЛИ дожидаемся скрытия ModalCard
|
|
29
|
+
* 3b. activeModal: m2, exitingModal: null, enteringModal: m2
|
|
30
|
+
* 4b. enteringModal переходит в null после завершения анимации
|
|
31
|
+
* 5. activeModal: m2, exitingModal: null, enteringModal: null, переход закончен
|
|
32
|
+
*/
|
|
33
|
+
export declare function useModalManager(activeModal: string, children: React.ReactNode | React.ReactNode[], onClose: (id: string) => void, initModal?: (state: ModalsStateEntry) => void): ModalTransitionProps;
|
|
34
|
+
export declare function withModalManager(initModal?: (a: ModalsStateEntry) => void): <Props extends ModalTransitionProps>(Wrapped: React.ComponentType<Props>) => React.FC<Pick<Props, Exclude<keyof Props, "isBack" | "onEnter" | "history" | "onExit" | "getModalState" | "closeActiveModal" | "delayEnter" | "activeModal" | "enteringModal" | "exitingModal">> & {
|
|
35
|
+
activeModal: string;
|
|
36
|
+
}>;
|
|
37
|
+
export {};
|