@vkontakte/vkui 4.19.0 → 4.22.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/.cache/.eslintcache +1 -1
- package/.cache/.stylelintcache +1 -1
- package/.cache/.tsbuildinfo +493 -125
- package/.cache/ts/src/components/ActionSheet/types.d.ts +2 -2
- package/.cache/ts/src/components/Alert/Alert.d.ts +1 -0
- package/.cache/ts/src/components/AppRoot/AppRootContext.d.ts +1 -0
- 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 +8 -0
- 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/PullToRefresh/PullToRefresh.d.ts +0 -1
- 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/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 +4 -2
- package/.cache/ts/src/lib/is.d.ts +1 -0
- package/.cache/ts/src/lib/supportEvents.d.ts +3 -1
- package/.cache/ts/src/testing/utils.d.ts +2 -0
- package/.cache/ts/src/types.d.ts +3 -0
- package/dist/cjs/components/ActionSheet/ActionSheet.js +13 -12
- package/dist/cjs/components/ActionSheet/ActionSheet.js.map +1 -1
- package/dist/cjs/components/ActionSheet/ActionSheetDropdown.js +3 -1
- package/dist/cjs/components/ActionSheet/ActionSheetDropdown.js.map +1 -1
- package/dist/cjs/components/ActionSheet/ActionSheetDropdownDesktop.js +10 -5
- package/dist/cjs/components/ActionSheet/ActionSheetDropdownDesktop.js.map +1 -1
- package/dist/cjs/components/ActionSheet/types.d.ts +2 -2
- package/dist/cjs/components/Alert/Alert.d.ts +1 -0
- package/dist/cjs/components/Alert/Alert.js +12 -3
- package/dist/cjs/components/Alert/Alert.js.map +1 -1
- package/dist/cjs/components/AppRoot/AppRoot.js +2 -1
- package/dist/cjs/components/AppRoot/AppRoot.js.map +1 -1
- package/dist/cjs/components/AppRoot/AppRootContext.d.ts +1 -0
- package/dist/cjs/components/AppRoot/AppRootContext.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/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 +140 -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 +6 -4
- package/dist/cjs/components/CustomSelect/CustomSelect.js.map +1 -1
- package/dist/cjs/components/DatePicker/DatePicker.js +6 -4
- package/dist/cjs/components/DatePicker/DatePicker.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 +8 -0
- package/dist/cjs/components/FocusTrap/FocusTrap.js +165 -0
- package/dist/cjs/components/FocusTrap/FocusTrap.js.map +1 -0
- 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 +184 -368
- 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 +74 -244
- 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/PullToRefresh/PullToRefresh.d.ts +0 -1
- package/dist/cjs/components/PullToRefresh/PullToRefresh.js +34 -25
- package/dist/cjs/components/PullToRefresh/PullToRefresh.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/Root/Root.js +1 -0
- package/dist/cjs/components/Root/Root.js.map +1 -1
- package/dist/cjs/components/Search/Search.js +1 -1
- package/dist/cjs/components/Search/Search.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/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 +34 -14
- 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 +4 -2
- package/dist/cjs/lib/accessibility.js +8 -1
- package/dist/cjs/lib/accessibility.js.map +1 -1
- package/dist/cjs/lib/is.d.ts +1 -0
- package/dist/cjs/lib/is.js +13 -0
- package/dist/cjs/lib/is.js.map +1 -0
- 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 +12 -12
- package/dist/components/ActionSheet/ActionSheet.js.map +1 -1
- package/dist/components/ActionSheet/ActionSheetDropdown.js +2 -1
- package/dist/components/ActionSheet/ActionSheetDropdown.js.map +1 -1
- package/dist/components/ActionSheet/ActionSheetDropdownDesktop.js +9 -5
- package/dist/components/ActionSheet/ActionSheetDropdownDesktop.js.map +1 -1
- package/dist/components/ActionSheet/types.d.ts +2 -2
- package/dist/components/Alert/Alert.d.ts +1 -0
- package/dist/components/Alert/Alert.js +11 -3
- package/dist/components/Alert/Alert.js.map +1 -1
- package/dist/components/AppRoot/AppRoot.js +2 -1
- package/dist/components/AppRoot/AppRoot.js.map +1 -1
- package/dist/components/AppRoot/AppRootContext.d.ts +1 -0
- package/dist/components/AppRoot/AppRootContext.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/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 +125 -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 +6 -6
- package/dist/components/CustomSelect/CustomSelect.js.map +1 -1
- package/dist/components/DatePicker/DatePicker.js +6 -4
- package/dist/components/DatePicker/DatePicker.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 +8 -0
- package/dist/components/FocusTrap/FocusTrap.js +138 -0
- package/dist/components/FocusTrap/FocusTrap.js.map +1 -0
- 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 +181 -371
- 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 +72 -248
- 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/PullToRefresh/PullToRefresh.d.ts +0 -1
- package/dist/components/PullToRefresh/PullToRefresh.js +35 -25
- package/dist/components/PullToRefresh/PullToRefresh.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/Root/Root.js +1 -0
- package/dist/components/Root/Root.js.map +1 -1
- package/dist/components/Search/Search.js +1 -1
- package/dist/components/Search/Search.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/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 +34 -14
- 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 +12 -12
- package/dist/cssm/components/ActionSheet/ActionSheet.js.map +1 -1
- package/dist/cssm/components/ActionSheet/ActionSheetDropdown.js +2 -1
- package/dist/cssm/components/ActionSheet/ActionSheetDropdown.js.map +1 -1
- package/dist/cssm/components/ActionSheet/ActionSheetDropdownDesktop.js +9 -5
- package/dist/cssm/components/ActionSheet/ActionSheetDropdownDesktop.js.map +1 -1
- package/dist/cssm/components/Alert/Alert.js +11 -3
- package/dist/cssm/components/Alert/Alert.js.map +1 -1
- package/dist/cssm/components/AppRoot/AppRoot.js +2 -1
- package/dist/cssm/components/AppRoot/AppRoot.js.map +1 -1
- package/dist/cssm/components/AppRoot/AppRootContext.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/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 +125 -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 +6 -6
- package/dist/cssm/components/CustomSelect/CustomSelect.js.map +1 -1
- package/dist/cssm/components/DatePicker/DatePicker.js +6 -4
- package/dist/cssm/components/DatePicker/DatePicker.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 +138 -0
- package/dist/cssm/components/FocusTrap/FocusTrap.js.map +1 -0
- 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 +181 -371
- 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 +72 -248
- 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/PullToRefresh/PullToRefresh.js +35 -25
- package/dist/cssm/components/PullToRefresh/PullToRefresh.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/Root/Root.css +1 -1
- package/dist/cssm/components/Root/Root.js +1 -0
- package/dist/cssm/components/Root/Root.js.map +1 -1
- package/dist/cssm/components/Search/Search.css +1 -1
- package/dist/cssm/components/Search/Search.js +1 -1
- package/dist/cssm/components/Search/Search.js.map +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/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 +34 -14
- 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 +6 -0
- package/dist/cssm/lib/accessibility.js.map +1 -1
- package/dist/cssm/lib/is.js +6 -0
- package/dist/cssm/lib/is.js.map +1 -0
- 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 +4 -2
- package/dist/lib/accessibility.js +6 -0
- package/dist/lib/accessibility.js.map +1 -1
- package/dist/lib/is.d.ts +1 -0
- package/dist/lib/is.js +6 -0
- package/dist/lib/is.js.map +1 -0
- 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 +9 -7
- package/src/components/ActionSheet/ActionSheetDropdown.tsx +3 -2
- package/src/components/ActionSheet/ActionSheetDropdownDesktop.tsx +9 -5
- package/src/components/ActionSheet/Readme.md +18 -14
- package/src/components/ActionSheet/types.ts +2 -2
- package/src/components/Alert/Alert.tsx +11 -4
- package/src/components/Alert/Readme.md +15 -11
- package/src/components/AppRoot/AppRoot.tsx +1 -0
- package/src/components/AppRoot/AppRootContext.ts +1 -0
- 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/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 +6 -5
- package/src/components/DatePicker/DatePicker.tsx +5 -5
- package/src/components/DropdownIcon/DropdownIcon.css +3 -0
- package/src/components/DropdownIcon/DropdownIcon.tsx +20 -0
- package/src/components/Epic/Readme.md +1 -1
- package/src/components/FocusTrap/FocusTrap.tsx +125 -0
- 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 +170 -344
- package/src/components/ModalRoot/ModalRootContext.tsx +0 -1
- package/src/components/ModalRoot/ModalRootDesktop.tsx +62 -243
- 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/PullToRefresh/PullToRefresh.tsx +30 -25
- package/src/components/Removable/Removable.css +16 -63
- package/src/components/Removable/Removable.tsx +84 -64
- package/src/components/Root/Root.css +5 -0
- package/src/components/Root/Root.tsx +4 -1
- package/src/components/ScreenSpinner/Readme.md +13 -9
- package/src/components/Search/Search.css +1 -1
- package/src/components/Search/Search.tsx +3 -3
- 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/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 +51 -31
- 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 +22 -2
- package/src/lib/is.ts +10 -0
- 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 +41 -0
- package/src/types.ts +4 -0
|
@@ -5,7 +5,6 @@ import { getClassName } from '../../helpers/getClassName';
|
|
|
5
5
|
import { classNames } from '../../lib/classNames';
|
|
6
6
|
import { setTransformStyle } from '../../lib/styles';
|
|
7
7
|
import { rubber } from '../../lib/touch';
|
|
8
|
-
import { isFunction } from '../../lib/utils';
|
|
9
8
|
import { ANDROID, IOS, VKCOM } from '../../lib/platform';
|
|
10
9
|
import { transitionEvent } from '../../lib/supportEvents';
|
|
11
10
|
import { HasPlatform } from '../../types';
|
|
@@ -17,11 +16,13 @@ import {
|
|
|
17
16
|
ConfigProviderContextInterface,
|
|
18
17
|
WebviewType,
|
|
19
18
|
} from '../ConfigProvider/ConfigProviderContext';
|
|
20
|
-
import {
|
|
19
|
+
import { ModalsStateEntry, ModalType, TranslateRange } from './types';
|
|
21
20
|
import { MODAL_PAGE_DEFAULT_PERCENT_HEIGHT } from './constants';
|
|
22
21
|
import { DOMProps, withDOM } from '../../lib/dom';
|
|
23
22
|
import { getNavId } from '../../lib/getNavId';
|
|
24
23
|
import { warnOnce } from '../../lib/warnOnce';
|
|
24
|
+
import { FocusTrap } from '../FocusTrap/FocusTrap';
|
|
25
|
+
import { ModalTransitionProps, withModalManager } from './useModalManager';
|
|
25
26
|
import './ModalRoot.css';
|
|
26
27
|
|
|
27
28
|
const warn = warnOnce('ModalRoot');
|
|
@@ -49,57 +50,31 @@ export interface ModalRootProps extends HasPlatform {
|
|
|
49
50
|
}
|
|
50
51
|
|
|
51
52
|
interface ModalRootState {
|
|
52
|
-
activeModal?: string;
|
|
53
|
-
prevModal?: string;
|
|
54
|
-
nextModal?: string;
|
|
55
|
-
visibleModals?: string[];
|
|
56
|
-
animated?: boolean;
|
|
57
|
-
switching?: boolean;
|
|
58
|
-
history?: string[];
|
|
59
|
-
isBack?: boolean;
|
|
60
|
-
inited?: boolean;
|
|
61
53
|
touchDown?: boolean;
|
|
62
54
|
dragging?: boolean;
|
|
63
55
|
}
|
|
64
56
|
|
|
65
|
-
class ModalRootTouchComponent extends React.Component<ModalRootProps & DOMProps, ModalRootState> {
|
|
66
|
-
constructor(props: ModalRootProps) {
|
|
57
|
+
class ModalRootTouchComponent extends React.Component<ModalRootProps & DOMProps & ModalTransitionProps, ModalRootState> {
|
|
58
|
+
constructor(props: ModalRootProps & ModalTransitionProps) {
|
|
67
59
|
super(props);
|
|
68
|
-
|
|
69
|
-
const activeModal = props.activeModal;
|
|
70
|
-
|
|
71
60
|
this.state = {
|
|
72
|
-
activeModal: null,
|
|
73
|
-
prevModal: null,
|
|
74
|
-
nextModal: activeModal,
|
|
75
|
-
visibleModals: activeModal ? [activeModal] : [],
|
|
76
|
-
animated: !!activeModal,
|
|
77
|
-
switching: false,
|
|
78
|
-
history: activeModal ? [activeModal] : [],
|
|
79
|
-
isBack: false,
|
|
80
|
-
inited: false,
|
|
81
61
|
touchDown: false,
|
|
82
62
|
dragging: false,
|
|
83
63
|
};
|
|
84
64
|
|
|
85
|
-
this.activeTransitions = 0;
|
|
86
65
|
this.maskElementRef = React.createRef();
|
|
87
66
|
|
|
88
|
-
this.initModalsState();
|
|
89
|
-
|
|
90
67
|
this.modalRootContext = {
|
|
91
68
|
updateModalHeight: this.updateModalHeight,
|
|
92
|
-
registerModal: ({ id, ...data }) => Object.assign(this.
|
|
93
|
-
onClose: this.
|
|
69
|
+
registerModal: ({ id, ...data }) => Object.assign(this.getModalState(id), data),
|
|
70
|
+
onClose: () => this.props.closeActiveModal(),
|
|
94
71
|
isInsideModal: true,
|
|
95
72
|
};
|
|
96
73
|
|
|
97
74
|
this.frameIds = {};
|
|
98
75
|
}
|
|
99
76
|
|
|
100
|
-
private modalsState: ModalsState;
|
|
101
77
|
private documentScrolling: boolean;
|
|
102
|
-
private activeTransitions: number;
|
|
103
78
|
private readonly maskElementRef: React.RefObject<HTMLDivElement>;
|
|
104
79
|
private readonly viewportRef = React.createRef<HTMLDivElement>();
|
|
105
80
|
private maskAnimationFrame: number;
|
|
@@ -107,6 +82,11 @@ class ModalRootTouchComponent extends React.Component<ModalRootProps & DOMProps,
|
|
|
107
82
|
private readonly frameIds: {
|
|
108
83
|
[index: string]: number;
|
|
109
84
|
};
|
|
85
|
+
private restoreFocusTo: HTMLElement;
|
|
86
|
+
|
|
87
|
+
get timeout(): number {
|
|
88
|
+
return this.props.platform === ANDROID || this.props.platform === VKCOM ? 320 : 400;
|
|
89
|
+
}
|
|
110
90
|
|
|
111
91
|
get document(): Document {
|
|
112
92
|
return this.props.document;
|
|
@@ -116,89 +96,54 @@ class ModalRootTouchComponent extends React.Component<ModalRootProps & DOMProps,
|
|
|
116
96
|
return this.props.window;
|
|
117
97
|
}
|
|
118
98
|
|
|
119
|
-
|
|
120
|
-
return
|
|
99
|
+
getModalState(id: string) {
|
|
100
|
+
return this.props.getModalState(id);
|
|
121
101
|
}
|
|
122
102
|
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
const modalProps = Modal.props;
|
|
126
|
-
const state: ModalsStateEntry = {
|
|
127
|
-
id: getNavId(modalProps, warn),
|
|
128
|
-
onClose: Modal.props.onClose,
|
|
129
|
-
dynamicContentHeight: !!modalProps.dynamicContentHeight,
|
|
130
|
-
};
|
|
131
|
-
|
|
132
|
-
// ModalPage props
|
|
133
|
-
if (typeof modalProps.settlingHeight === 'number') {
|
|
134
|
-
state.settlingHeight = modalProps.settlingHeight;
|
|
135
|
-
}
|
|
136
|
-
|
|
137
|
-
acc[state.id] = state;
|
|
138
|
-
return acc;
|
|
139
|
-
}, {});
|
|
103
|
+
getModals() {
|
|
104
|
+
return React.Children.toArray(this.props.children) as React.ReactElement[];
|
|
140
105
|
}
|
|
141
106
|
|
|
142
107
|
componentDidMount() {
|
|
143
|
-
|
|
108
|
+
// Отслеживаем изменение размеров viewport (Необходимо для iOS)
|
|
109
|
+
if (this.props.platform === IOS) {
|
|
110
|
+
this.window.addEventListener('resize', this.updateModalTranslate, false);
|
|
111
|
+
}
|
|
144
112
|
}
|
|
145
113
|
|
|
146
114
|
componentWillUnmount() {
|
|
147
115
|
this.toggleDocumentScrolling(true);
|
|
148
|
-
|
|
149
|
-
this.window.removeEventListener('resize', this.updateModalTranslate, false);
|
|
150
|
-
}
|
|
116
|
+
this.window.removeEventListener('resize', this.updateModalTranslate, false);
|
|
151
117
|
}
|
|
152
118
|
|
|
153
|
-
componentDidUpdate(prevProps: ModalRootProps
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
if (IS_DEV && nextModal !== null && !this.modalsState[nextModal]) {
|
|
159
|
-
return warn(`[componentDidUpdate] nextModal ${nextModal} not found`);
|
|
160
|
-
}
|
|
161
|
-
|
|
162
|
-
let history = [...this.state.history];
|
|
163
|
-
let isBack = false;
|
|
164
|
-
|
|
165
|
-
if (nextModal === null) {
|
|
166
|
-
history = [];
|
|
167
|
-
} else if (history.includes(nextModal)) {
|
|
168
|
-
history = history.splice(0, history.indexOf(nextModal) + 1);
|
|
169
|
-
isBack = true;
|
|
170
|
-
} else {
|
|
171
|
-
history.push(nextModal);
|
|
172
|
-
}
|
|
119
|
+
componentDidUpdate(prevProps: ModalRootProps & ModalTransitionProps) {
|
|
120
|
+
// transition phase 2: animate exiting modal
|
|
121
|
+
if (this.props.exitingModal && this.props.exitingModal !== prevProps.exitingModal) {
|
|
122
|
+
this.closeModal(this.props.exitingModal);
|
|
123
|
+
}
|
|
173
124
|
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
animated: true,
|
|
182
|
-
inited: false,
|
|
183
|
-
switching: false,
|
|
184
|
-
}, () => {
|
|
185
|
-
if (nextModal === null) {
|
|
186
|
-
this.closeActiveModal();
|
|
187
|
-
} else {
|
|
188
|
-
this.initActiveModal();
|
|
189
|
-
}
|
|
125
|
+
// transition phase 3: animate entering modal
|
|
126
|
+
if (this.props.enteringModal && this.props.enteringModal !== prevProps.enteringModal) {
|
|
127
|
+
const { enteringModal } = this.props;
|
|
128
|
+
const enteringState = this.getModalState(enteringModal);
|
|
129
|
+
this.waitTransitionFinish(enteringState, () => {
|
|
130
|
+
enteringState.innerElement.style.transitionDelay = null;
|
|
131
|
+
this.props.onEnter(enteringModal);
|
|
190
132
|
});
|
|
133
|
+
enteringState.innerElement.style.transitionDelay = this.props.delayEnter ? `${this.timeout}ms` : null;
|
|
134
|
+
this.animateTranslate(enteringState, enteringState.translateY);
|
|
191
135
|
}
|
|
192
136
|
|
|
193
|
-
|
|
194
|
-
|
|
137
|
+
// focus restoration
|
|
138
|
+
if (this.props.activeModal && !prevProps.activeModal) {
|
|
139
|
+
this.restoreFocusTo = this.document.activeElement as HTMLElement;
|
|
195
140
|
}
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
this.
|
|
199
|
-
} else {
|
|
200
|
-
this.toggleDocumentScrolling(false);
|
|
141
|
+
if (!this.props.activeModal && !this.props.exitingModal && this.restoreFocusTo) {
|
|
142
|
+
this.restoreFocusTo.focus();
|
|
143
|
+
this.restoreFocusTo = null;
|
|
201
144
|
}
|
|
145
|
+
|
|
146
|
+
this.toggleDocumentScrolling(!this.props.activeModal && !this.props.exitingModal);
|
|
202
147
|
}
|
|
203
148
|
|
|
204
149
|
/* Отключает скролл документа */
|
|
@@ -232,117 +177,17 @@ class ModalRootTouchComponent extends React.Component<ModalRootProps & DOMProps,
|
|
|
232
177
|
return false;
|
|
233
178
|
};
|
|
234
179
|
|
|
235
|
-
/**
|
|
236
|
-
* Инициализирует модалку перед анимацией открытия
|
|
237
|
-
*/
|
|
238
|
-
initActiveModal() {
|
|
239
|
-
const activeModal = this.state.activeModal || this.state.nextModal;
|
|
240
|
-
if (!activeModal) {
|
|
241
|
-
return;
|
|
242
|
-
}
|
|
243
|
-
|
|
244
|
-
const modalState = this.modalsState[activeModal];
|
|
245
|
-
// Отслеживаем изменение размеров viewport (Необходимо для iOS)
|
|
246
|
-
if (this.props.platform === IOS) {
|
|
247
|
-
this.window.addEventListener('resize', this.updateModalTranslate, false);
|
|
248
|
-
}
|
|
249
|
-
|
|
250
|
-
switch (modalState.type) {
|
|
251
|
-
case ModalType.PAGE:
|
|
252
|
-
modalState.settlingHeight = modalState.settlingHeight || MODAL_PAGE_DEFAULT_PERCENT_HEIGHT;
|
|
253
|
-
this.initPageModal(modalState);
|
|
254
|
-
break;
|
|
255
|
-
|
|
256
|
-
case ModalType.CARD:
|
|
257
|
-
this.initCardModal(modalState);
|
|
258
|
-
break;
|
|
259
|
-
|
|
260
|
-
default:
|
|
261
|
-
if (IS_DEV) {
|
|
262
|
-
warn('[initActiveModal] modalState.type is unknown');
|
|
263
|
-
}
|
|
264
|
-
}
|
|
265
|
-
|
|
266
|
-
this.setState({ inited: true, switching: true });
|
|
267
|
-
}
|
|
268
|
-
|
|
269
180
|
updateModalTranslate = () => {
|
|
270
|
-
const
|
|
271
|
-
|
|
272
|
-
return;
|
|
273
|
-
}
|
|
274
|
-
|
|
275
|
-
const modalState = this.modalsState[activeModal];
|
|
276
|
-
this.animateTranslate(modalState, modalState.translateY);
|
|
181
|
+
const modalState = this.getModalState(this.props.activeModal);
|
|
182
|
+
modalState && this.animateTranslate(modalState, modalState.translateY);
|
|
277
183
|
};
|
|
278
184
|
|
|
279
|
-
initPageModal(modalState: ModalsStateEntry) {
|
|
280
|
-
const { contentElement } = modalState;
|
|
281
|
-
const contentHeight = (contentElement.firstElementChild as HTMLElement).offsetHeight;
|
|
282
|
-
|
|
283
|
-
let prevTranslateY = modalState.translateY;
|
|
284
|
-
|
|
285
|
-
modalState.expandable = contentHeight > contentElement.clientHeight || modalState.settlingHeight === 100;
|
|
286
|
-
|
|
287
|
-
let collapsed = false;
|
|
288
|
-
let expanded = false;
|
|
289
|
-
let translateYFrom;
|
|
290
|
-
let translateY;
|
|
291
|
-
let expandedRange: TranslateRange;
|
|
292
|
-
let collapsedRange: TranslateRange;
|
|
293
|
-
let hiddenRange: TranslateRange;
|
|
294
|
-
|
|
295
|
-
if (modalState.expandable) {
|
|
296
|
-
translateYFrom = 100 - modalState.settlingHeight;
|
|
297
|
-
|
|
298
|
-
const shiftHalf = translateYFrom / 2;
|
|
299
|
-
const visiblePart = 100 - translateYFrom;
|
|
300
|
-
|
|
301
|
-
expandedRange = [0, shiftHalf];
|
|
302
|
-
collapsedRange = [shiftHalf, translateYFrom + visiblePart / 4];
|
|
303
|
-
hiddenRange = [translateYFrom + visiblePart / 4, 100];
|
|
304
|
-
|
|
305
|
-
collapsed = translateYFrom > 0;
|
|
306
|
-
expanded = translateYFrom <= 0;
|
|
307
|
-
translateY = translateYFrom;
|
|
308
|
-
} else {
|
|
309
|
-
const headerHeight = modalState.headerElement.offsetHeight;
|
|
310
|
-
const height = contentHeight + headerHeight;
|
|
311
|
-
|
|
312
|
-
translateYFrom = 100 - height / modalState.innerElement.parentElement.offsetHeight * 100;
|
|
313
|
-
translateY = translateYFrom;
|
|
314
|
-
|
|
315
|
-
expandedRange = [translateY, translateY + 25];
|
|
316
|
-
collapsedRange = [translateY + 25, translateY + 25];
|
|
317
|
-
hiddenRange = [translateY + 25, translateY + 100];
|
|
318
|
-
}
|
|
319
|
-
|
|
320
|
-
// Если модалка может открываться на весь экран, и новый сдвиг больше предыдущего, то откроем её на весь экран
|
|
321
|
-
if (modalState.expandable && translateY > prevTranslateY || modalState.settlingHeight === 100) {
|
|
322
|
-
translateY = 0;
|
|
323
|
-
}
|
|
324
|
-
|
|
325
|
-
modalState.expandedRange = expandedRange;
|
|
326
|
-
modalState.collapsedRange = collapsedRange;
|
|
327
|
-
modalState.hiddenRange = hiddenRange;
|
|
328
|
-
modalState.translateY = translateY;
|
|
329
|
-
modalState.translateYFrom = translateYFrom;
|
|
330
|
-
modalState.collapsed = collapsed;
|
|
331
|
-
modalState.expanded = expanded;
|
|
332
|
-
}
|
|
333
|
-
|
|
334
|
-
initCardModal(modalState: ModalsStateEntry) {
|
|
335
|
-
modalState.translateY = 0;
|
|
336
|
-
}
|
|
337
|
-
|
|
338
185
|
checkPageContentHeight() {
|
|
339
|
-
const
|
|
340
|
-
const modalId = activeModal || nextModal;
|
|
186
|
+
const modalState = this.getModalState(this.props.activeModal);
|
|
341
187
|
|
|
342
|
-
const modalState = this.modalsState[modalId];
|
|
343
188
|
if (modalState?.type === ModalType.PAGE && modalState?.modalElement) {
|
|
344
189
|
const prevModalState = { ...modalState };
|
|
345
|
-
|
|
190
|
+
initPageModal(modalState);
|
|
346
191
|
const currentModalState = { ...modalState };
|
|
347
192
|
|
|
348
193
|
let needAnimate = false;
|
|
@@ -362,13 +207,10 @@ class ModalRootTouchComponent extends React.Component<ModalRootProps & DOMProps,
|
|
|
362
207
|
}
|
|
363
208
|
|
|
364
209
|
updateModalHeight = () => {
|
|
365
|
-
const
|
|
366
|
-
|
|
367
|
-
const modalId = activeModal || nextModal;
|
|
368
|
-
const modalState = modalId ? this.modalsState[modalId] : undefined;
|
|
210
|
+
const modalState = this.getModalState(this.props.activeModal);
|
|
369
211
|
|
|
370
212
|
if (modalState && modalState.type === ModalType.PAGE && modalState.dynamicContentHeight) {
|
|
371
|
-
if (this.
|
|
213
|
+
if (this.props.enteringModal) {
|
|
372
214
|
this.waitTransitionFinish(modalState, () => {
|
|
373
215
|
requestAnimationFrame(() => this.checkPageContentHeight());
|
|
374
216
|
});
|
|
@@ -378,37 +220,42 @@ class ModalRootTouchComponent extends React.Component<ModalRootProps & DOMProps,
|
|
|
378
220
|
}
|
|
379
221
|
};
|
|
380
222
|
|
|
381
|
-
|
|
223
|
+
closeModal(id: string) {
|
|
382
224
|
// Сбрасываем состояния, которые могут помешать закрытию модального окна
|
|
383
|
-
this.setState({ touchDown: false
|
|
225
|
+
this.setState({ touchDown: false });
|
|
384
226
|
|
|
385
|
-
|
|
386
|
-
this.window.removeEventListener('resize', this.updateModalTranslate, false);
|
|
387
|
-
}
|
|
227
|
+
const prevModalState = this.getModalState(id);
|
|
388
228
|
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
return
|
|
229
|
+
if (!prevModalState) {
|
|
230
|
+
id && warn(`[closeActiveModal] Modal ${id} does not exist - not closing`);
|
|
231
|
+
return;
|
|
392
232
|
}
|
|
393
233
|
|
|
394
|
-
const
|
|
234
|
+
const nextModalState = this.getModalState(this.props.activeModal);
|
|
235
|
+
const nextIsPage = !!nextModalState && nextModalState.type === ModalType.PAGE;
|
|
236
|
+
|
|
237
|
+
const prevIsPage = !!prevModalState && prevModalState.type === ModalType.PAGE;
|
|
238
|
+
this.waitTransitionFinish(prevModalState, () => this.props.onExit(id));
|
|
239
|
+
const exitTranslate = prevIsPage && nextIsPage && prevModalState.translateY <= nextModalState.translateYFrom && !this.props.isBack
|
|
240
|
+
? nextModalState.translateYFrom + 10
|
|
241
|
+
: 100;
|
|
242
|
+
this.animateTranslate(prevModalState, exitTranslate);
|
|
395
243
|
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
244
|
+
if (!nextModalState) {
|
|
245
|
+
// NOTE: was only for clean exit
|
|
246
|
+
this.setMaskOpacity(prevModalState, 0);
|
|
247
|
+
}
|
|
399
248
|
}
|
|
400
249
|
|
|
401
250
|
onTouchMove = (e: TouchEvent) => {
|
|
402
|
-
if (this.
|
|
251
|
+
if (this.props.exitingModal) {
|
|
403
252
|
return;
|
|
404
253
|
}
|
|
405
|
-
const
|
|
406
|
-
if (!
|
|
254
|
+
const modalState = this.getModalState(this.props.activeModal);
|
|
255
|
+
if (!modalState) {
|
|
407
256
|
return;
|
|
408
257
|
}
|
|
409
258
|
|
|
410
|
-
const modalState = this.modalsState[activeModal];
|
|
411
|
-
|
|
412
259
|
if (modalState.type === ModalType.PAGE) {
|
|
413
260
|
return this.onPageTouchMove(e, modalState);
|
|
414
261
|
}
|
|
@@ -495,11 +342,7 @@ class ModalRootTouchComponent extends React.Component<ModalRootProps & DOMProps,
|
|
|
495
342
|
}
|
|
496
343
|
|
|
497
344
|
onTouchEnd = (e: TouchEvent) => {
|
|
498
|
-
const
|
|
499
|
-
if (!activeModal) {
|
|
500
|
-
return;
|
|
501
|
-
}
|
|
502
|
-
const modalState = this.modalsState[activeModal];
|
|
345
|
+
const modalState = this.getModalState(this.props.activeModal);
|
|
503
346
|
|
|
504
347
|
if (modalState.type === ModalType.PAGE) {
|
|
505
348
|
return this.onPageTouchEnd(e, modalState);
|
|
@@ -554,7 +397,7 @@ class ModalRootTouchComponent extends React.Component<ModalRootProps & DOMProps,
|
|
|
554
397
|
modalState.hidden = translateY === 100;
|
|
555
398
|
|
|
556
399
|
if (modalState.hidden) {
|
|
557
|
-
this.
|
|
400
|
+
this.props.closeActiveModal();
|
|
558
401
|
}
|
|
559
402
|
|
|
560
403
|
setStateCallback = () => {
|
|
@@ -591,7 +434,7 @@ class ModalRootTouchComponent extends React.Component<ModalRootProps & DOMProps,
|
|
|
591
434
|
modalState.hidden = translateY === 100;
|
|
592
435
|
|
|
593
436
|
if (modalState.hidden) {
|
|
594
|
-
this.
|
|
437
|
+
this.props.closeActiveModal();
|
|
595
438
|
}
|
|
596
439
|
|
|
597
440
|
setStateCallback = () => {
|
|
@@ -610,14 +453,14 @@ class ModalRootTouchComponent extends React.Component<ModalRootProps & DOMProps,
|
|
|
610
453
|
}
|
|
611
454
|
|
|
612
455
|
onScroll = (e: React.SyntheticEvent) => {
|
|
613
|
-
const activeModal = this.
|
|
456
|
+
const activeModal = this.props.activeModal;
|
|
614
457
|
|
|
615
458
|
const target = e.target as HTMLElement;
|
|
616
459
|
|
|
617
460
|
if (!activeModal) {
|
|
618
461
|
return;
|
|
619
462
|
}
|
|
620
|
-
const modalState = this.
|
|
463
|
+
const modalState = this.getModalState(activeModal);
|
|
621
464
|
if (modalState.type === ModalType.PAGE && modalState.contentElement.contains(target)) {
|
|
622
465
|
modalState.contentScrolled = true;
|
|
623
466
|
|
|
@@ -640,77 +483,10 @@ class ModalRootTouchComponent extends React.Component<ModalRootProps & DOMProps,
|
|
|
640
483
|
|
|
641
484
|
modalState.innerElement.addEventListener(transitionEvent.name, onceHandler);
|
|
642
485
|
} else {
|
|
643
|
-
setTimeout(eventHandler, this.
|
|
644
|
-
}
|
|
645
|
-
}
|
|
646
|
-
|
|
647
|
-
switchPrevNext() {
|
|
648
|
-
const { prevModal, nextModal } = this.state;
|
|
649
|
-
|
|
650
|
-
const prevModalState = this.modalsState[prevModal];
|
|
651
|
-
const nextModalState = this.modalsState[nextModal];
|
|
652
|
-
|
|
653
|
-
if (IS_DEV && !prevModalState && !nextModalState) {
|
|
654
|
-
return warn(`[switchPrevNext] prevModal is ${prevModal}, nextModal is ${nextModal}`);
|
|
655
|
-
}
|
|
656
|
-
|
|
657
|
-
const prevIsPage = !!prevModalState && prevModalState.type === ModalType.PAGE;
|
|
658
|
-
const prevIsCard = !!prevModalState && prevModalState.type === ModalType.CARD;
|
|
659
|
-
|
|
660
|
-
const nextIsPage = !!nextModalState && nextModalState.type === ModalType.PAGE;
|
|
661
|
-
const nextIsCard = !!nextModalState && nextModalState.type === ModalType.CARD;
|
|
662
|
-
|
|
663
|
-
// Ждём полного скрытия предыдущей модалки
|
|
664
|
-
if (prevModalState && (nextIsCard || prevIsCard && nextIsPage)) {
|
|
665
|
-
this.waitTransitionFinish(prevModalState, () => {
|
|
666
|
-
this.activeTransitions += 1;
|
|
667
|
-
this.waitTransitionFinish(nextModalState, this.prevNextSwitchEndHandler);
|
|
668
|
-
this.animateTranslate(nextModalState, nextModalState.translateY);
|
|
669
|
-
});
|
|
670
|
-
|
|
671
|
-
return this.animateTranslate(prevModalState, 100);
|
|
672
|
-
}
|
|
673
|
-
|
|
674
|
-
if (prevModalState && nextIsPage) {
|
|
675
|
-
this.activeTransitions += 1;
|
|
676
|
-
this.waitTransitionFinish(prevModalState, this.prevNextSwitchEndHandler);
|
|
677
|
-
|
|
678
|
-
if (prevIsPage && prevModalState.translateY <= nextModalState.translateYFrom && !this.state.isBack) {
|
|
679
|
-
this.animateTranslate(prevModalState, nextModalState.translateYFrom + 10);
|
|
680
|
-
} else {
|
|
681
|
-
this.animateTranslate(prevModalState, 100);
|
|
682
|
-
}
|
|
486
|
+
setTimeout(eventHandler, this.timeout);
|
|
683
487
|
}
|
|
684
|
-
|
|
685
|
-
this.activeTransitions += 1;
|
|
686
|
-
this.waitTransitionFinish(nextModalState, this.prevNextSwitchEndHandler);
|
|
687
|
-
this.animateTranslate(nextModalState, nextModalState.translateY);
|
|
688
488
|
}
|
|
689
489
|
|
|
690
|
-
prevNextSwitchEndHandler = () => {
|
|
691
|
-
this.activeTransitions = Math.max(0, this.activeTransitions - 1);
|
|
692
|
-
if (this.activeTransitions > 0) {
|
|
693
|
-
return;
|
|
694
|
-
}
|
|
695
|
-
|
|
696
|
-
const activeModal = this.state.nextModal;
|
|
697
|
-
|
|
698
|
-
const newState: ModalRootState = {
|
|
699
|
-
prevModal: null,
|
|
700
|
-
nextModal: null,
|
|
701
|
-
visibleModals: [activeModal],
|
|
702
|
-
activeModal: activeModal,
|
|
703
|
-
animated: false,
|
|
704
|
-
switching: false,
|
|
705
|
-
};
|
|
706
|
-
|
|
707
|
-
if (!activeModal) {
|
|
708
|
-
newState.history = [];
|
|
709
|
-
}
|
|
710
|
-
|
|
711
|
-
this.setState(newState);
|
|
712
|
-
};
|
|
713
|
-
|
|
714
490
|
/**
|
|
715
491
|
* Анимирует сдвиг модалки
|
|
716
492
|
*
|
|
@@ -724,19 +500,12 @@ class ModalRootTouchComponent extends React.Component<ModalRootProps & DOMProps,
|
|
|
724
500
|
|
|
725
501
|
this.frameIds[frameId] = requestAnimationFrame(() => {
|
|
726
502
|
setTransformStyle(modalState.innerElement, `translate3d(0, ${percent}%, 0)`);
|
|
727
|
-
|
|
728
|
-
if (modalState.type === ModalType.PAGE && modalState.footerElement) {
|
|
729
|
-
const footerHeight = modalState.footerElement.offsetHeight;
|
|
730
|
-
const factor = modalState.innerElement.offsetHeight * (percent / 100);
|
|
731
|
-
|
|
732
|
-
setTransformStyle(modalState.footerElement, `translateY(calc(${footerHeight}px * -${factor / footerHeight}))`);
|
|
733
|
-
}
|
|
734
503
|
});
|
|
735
504
|
}
|
|
736
505
|
|
|
737
506
|
/* Устанавливает прозрачность для полупрозрачной подложки */
|
|
738
507
|
setMaskOpacity(modalState: ModalsStateEntry, forceOpacity: number = null) {
|
|
739
|
-
if (forceOpacity === null && this.
|
|
508
|
+
if (forceOpacity === null && this.props.history[0] !== modalState.id) {
|
|
740
509
|
return;
|
|
741
510
|
}
|
|
742
511
|
|
|
@@ -751,33 +520,11 @@ class ModalRootTouchComponent extends React.Component<ModalRootProps & DOMProps,
|
|
|
751
520
|
});
|
|
752
521
|
}
|
|
753
522
|
|
|
754
|
-
/**
|
|
755
|
-
* Закрывает текущую модалку
|
|
756
|
-
*/
|
|
757
|
-
triggerActiveModalClose = () => {
|
|
758
|
-
const activeModalState = this.modalsState[this.state.activeModal];
|
|
759
|
-
if (activeModalState) {
|
|
760
|
-
this.doCloseModal(activeModalState);
|
|
761
|
-
}
|
|
762
|
-
};
|
|
763
|
-
|
|
764
|
-
private readonly doCloseModal = (modalState: ModalsStateEntry) => {
|
|
765
|
-
// Сбрасываем состояния, которые могут помешать закрытию модального окна
|
|
766
|
-
this.setState({ touchDown: false, switching: false });
|
|
767
|
-
|
|
768
|
-
if (isFunction(modalState.onClose)) {
|
|
769
|
-
modalState.onClose();
|
|
770
|
-
} else if (isFunction(this.props.onClose)) {
|
|
771
|
-
this.props.onClose(modalState.id);
|
|
772
|
-
} else if (IS_DEV) {
|
|
773
|
-
warn('onClose is undefined');
|
|
774
|
-
}
|
|
775
|
-
};
|
|
776
|
-
|
|
777
523
|
render() {
|
|
778
|
-
const {
|
|
524
|
+
const { activeModal, exitingModal, enteringModal } = this.props;
|
|
525
|
+
const { touchDown, dragging } = this.state;
|
|
779
526
|
|
|
780
|
-
if (!activeModal && !
|
|
527
|
+
if (!activeModal && !exitingModal) {
|
|
781
528
|
return null;
|
|
782
529
|
}
|
|
783
530
|
|
|
@@ -788,7 +535,7 @@ class ModalRootTouchComponent extends React.Component<ModalRootProps & DOMProps,
|
|
|
788
535
|
vkuiClass={classNames(getClassName('ModalRoot', this.props.platform), {
|
|
789
536
|
'ModalRoot--vkapps': this.props.configProvider.webviewType === WebviewType.VKAPPS,
|
|
790
537
|
'ModalRoot--touched': touchDown,
|
|
791
|
-
'ModalRoot--switching':
|
|
538
|
+
'ModalRoot--switching': !!(enteringModal || exitingModal),
|
|
792
539
|
})}
|
|
793
540
|
onMove={this.onTouchMove}
|
|
794
541
|
onEnd={this.onTouchEnd}
|
|
@@ -796,28 +543,30 @@ class ModalRootTouchComponent extends React.Component<ModalRootProps & DOMProps,
|
|
|
796
543
|
>
|
|
797
544
|
<div
|
|
798
545
|
vkuiClass="ModalRoot__mask"
|
|
799
|
-
onClick={this.
|
|
546
|
+
onClick={this.props.closeActiveModal}
|
|
800
547
|
ref={this.maskElementRef}
|
|
801
548
|
/>
|
|
802
549
|
<div vkuiClass="ModalRoot__viewport" ref={this.viewportRef}>
|
|
803
550
|
{this.getModals().map((Modal) => {
|
|
804
551
|
const modalId = getNavId(Modal.props, warn);
|
|
805
|
-
if (
|
|
552
|
+
if (modalId !== activeModal && modalId !== exitingModal) {
|
|
806
553
|
return null;
|
|
807
554
|
}
|
|
808
|
-
const modalState = { ...this.
|
|
555
|
+
const modalState = { ...this.getModalState(modalId) };
|
|
809
556
|
|
|
810
557
|
const isPage = modalState.type === ModalType.PAGE;
|
|
811
558
|
const key = `modal-${modalId}`;
|
|
812
559
|
|
|
813
560
|
return (
|
|
814
|
-
<
|
|
561
|
+
<FocusTrap
|
|
815
562
|
key={key}
|
|
816
|
-
|
|
563
|
+
getRootRef={(e) => this.getModalState(modalId).modalElement = e}
|
|
564
|
+
onClose={this.props.closeActiveModal}
|
|
565
|
+
timeout={this.timeout}
|
|
817
566
|
vkuiClass={classNames('ModalRoot__modal', {
|
|
818
567
|
'ModalRoot__modal--active': modalId === activeModal,
|
|
819
|
-
'ModalRoot__modal--prev': modalId ===
|
|
820
|
-
'ModalRoot__modal--next': modalId ===
|
|
568
|
+
'ModalRoot__modal--prev': modalId === exitingModal,
|
|
569
|
+
'ModalRoot__modal--next': exitingModal && modalId === activeModal || modalId === enteringModal,
|
|
821
570
|
|
|
822
571
|
'ModalRoot__modal--dragging': dragging,
|
|
823
572
|
|
|
@@ -825,7 +574,8 @@ class ModalRootTouchComponent extends React.Component<ModalRootProps & DOMProps,
|
|
|
825
574
|
'ModalRoot__modal--expanded': isPage && modalState.expanded,
|
|
826
575
|
'ModalRoot__modal--collapsed': isPage && modalState.collapsed,
|
|
827
576
|
})}
|
|
828
|
-
|
|
577
|
+
restoreFocus={false}
|
|
578
|
+
>{Modal}</FocusTrap>
|
|
829
579
|
);
|
|
830
580
|
})}
|
|
831
581
|
</div>
|
|
@@ -836,4 +586,80 @@ class ModalRootTouchComponent extends React.Component<ModalRootProps & DOMProps,
|
|
|
836
586
|
}
|
|
837
587
|
}
|
|
838
588
|
|
|
839
|
-
export const ModalRootTouch = withContext(withPlatform(withDOM<ModalRootProps>(
|
|
589
|
+
export const ModalRootTouch = withContext(withPlatform(withDOM<ModalRootProps>(
|
|
590
|
+
withModalManager(initModal)(ModalRootTouchComponent),
|
|
591
|
+
)), ConfigProviderContext, 'configProvider');
|
|
592
|
+
|
|
593
|
+
/**
|
|
594
|
+
* Инициализирует модалку перед анимацией открытия
|
|
595
|
+
*/
|
|
596
|
+
function initModal(modalState: ModalsStateEntry) {
|
|
597
|
+
switch (modalState.type) {
|
|
598
|
+
case ModalType.PAGE:
|
|
599
|
+
modalState.settlingHeight = modalState.settlingHeight || MODAL_PAGE_DEFAULT_PERCENT_HEIGHT;
|
|
600
|
+
return initPageModal(modalState);
|
|
601
|
+
case ModalType.CARD:
|
|
602
|
+
return initCardModal(modalState);
|
|
603
|
+
default:
|
|
604
|
+
IS_DEV && warn('[initActiveModal] modalState.type is unknown');
|
|
605
|
+
}
|
|
606
|
+
}
|
|
607
|
+
|
|
608
|
+
function initPageModal(modalState: ModalsStateEntry) {
|
|
609
|
+
const { contentElement } = modalState;
|
|
610
|
+
const contentHeight = (contentElement.firstElementChild as HTMLElement).offsetHeight;
|
|
611
|
+
|
|
612
|
+
let prevTranslateY = modalState.translateY;
|
|
613
|
+
|
|
614
|
+
modalState.expandable = contentHeight > contentElement.clientHeight || modalState.settlingHeight === 100;
|
|
615
|
+
|
|
616
|
+
let collapsed = false;
|
|
617
|
+
let expanded = false;
|
|
618
|
+
let translateYFrom;
|
|
619
|
+
let translateY;
|
|
620
|
+
let expandedRange: TranslateRange;
|
|
621
|
+
let collapsedRange: TranslateRange;
|
|
622
|
+
let hiddenRange: TranslateRange;
|
|
623
|
+
|
|
624
|
+
if (modalState.expandable) {
|
|
625
|
+
translateYFrom = 100 - modalState.settlingHeight;
|
|
626
|
+
|
|
627
|
+
const shiftHalf = translateYFrom / 2;
|
|
628
|
+
const visiblePart = 100 - translateYFrom;
|
|
629
|
+
|
|
630
|
+
expandedRange = [0, shiftHalf];
|
|
631
|
+
collapsedRange = [shiftHalf, translateYFrom + visiblePart / 4];
|
|
632
|
+
hiddenRange = [translateYFrom + visiblePart / 4, 100];
|
|
633
|
+
|
|
634
|
+
collapsed = translateYFrom > 0;
|
|
635
|
+
expanded = translateYFrom <= 0;
|
|
636
|
+
translateY = translateYFrom;
|
|
637
|
+
} else {
|
|
638
|
+
const headerHeight = modalState.headerElement.offsetHeight;
|
|
639
|
+
const height = contentHeight + headerHeight;
|
|
640
|
+
|
|
641
|
+
translateYFrom = 100 - height / modalState.innerElement.parentElement.offsetHeight * 100;
|
|
642
|
+
translateY = translateYFrom;
|
|
643
|
+
|
|
644
|
+
expandedRange = [translateY, translateY + 25];
|
|
645
|
+
collapsedRange = [translateY + 25, translateY + 25];
|
|
646
|
+
hiddenRange = [translateY + 25, translateY + 100];
|
|
647
|
+
}
|
|
648
|
+
|
|
649
|
+
// Если модалка может открываться на весь экран, и новый сдвиг больше предыдущего, то откроем её на весь экран
|
|
650
|
+
if (modalState.expandable && translateY > prevTranslateY || modalState.settlingHeight === 100) {
|
|
651
|
+
translateY = 0;
|
|
652
|
+
}
|
|
653
|
+
|
|
654
|
+
modalState.expandedRange = expandedRange;
|
|
655
|
+
modalState.collapsedRange = collapsedRange;
|
|
656
|
+
modalState.hiddenRange = hiddenRange;
|
|
657
|
+
modalState.translateY = translateY;
|
|
658
|
+
modalState.translateYFrom = translateYFrom;
|
|
659
|
+
modalState.collapsed = collapsed;
|
|
660
|
+
modalState.expanded = expanded;
|
|
661
|
+
}
|
|
662
|
+
|
|
663
|
+
function initCardModal(modalState: ModalsStateEntry) {
|
|
664
|
+
modalState.translateY = 0;
|
|
665
|
+
}
|