Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 6.x into Master #7830

Merged
merged 37 commits into from
Oct 21, 2024
Merged

Merge 6.x into Master #7830

merged 37 commits into from
Oct 21, 2024

Conversation

andrey-skl
Copy link
Collaborator

No description provided.

vkrol and others added 30 commits July 26, 2024 10:58
…s-shortcuts' on parent, removed in 473d554"

This reverts commit 9192646.
* chore: Prevent dialog scroll

* chore: preventBodyScroll should not be passed as a part of restProps
… as a transparent containers"

This reverts commit 704bb21.
Fix Table colspan calculation when columns is passed as function
andrey-skl and others added 7 commits September 23, 2024 15:46
* RG-2490 support moving cursor from anchor to tooltip

* RG-2490 use React for "mouseout" event
# Conflicts:
#	.storybook/preview.ts
#	package-lock.json
#	package.json
#	packages/screenshots/testplane/chrome/components/alert/alert container/alert container-dark.png
#	packages/screenshots/testplane/chrome/components/alert/simple/simple-dark.png
#	packages/screenshots/testplane/chrome/components/auth dialog/auth dialog/auth dialog-dark.png
#	packages/screenshots/testplane/chrome/components/avatar/avatar/avatar-dark.png
#	packages/screenshots/testplane/chrome/components/breadcrumbs/default/default-dark.png
#	packages/screenshots/testplane/chrome/components/button group/button group/button group-dark.png
#	packages/screenshots/testplane/chrome/components/button/basic/basic-dark.png
#	packages/screenshots/testplane/chrome/components/button/height l/height l-dark.png
#	packages/screenshots/testplane/chrome/components/button/height s/height s-dark.png
#	packages/screenshots/testplane/chrome/components/collapse/the trigger with icon/the trigger with icon-dark.png
#	packages/screenshots/testplane/chrome/components/confirm/confirm/confirm-dark.png
#	packages/screenshots/testplane/chrome/components/datalist/datalist/datalist-dark.png
#	packages/screenshots/testplane/chrome/components/date picker/all sizes/all sizes-dark.png
#	packages/screenshots/testplane/chrome/components/date picker/clearable/clearable-dark.png
#	packages/screenshots/testplane/chrome/components/date picker/range with max date/range with max date-dark.png
#	packages/screenshots/testplane/chrome/components/date picker/range with min date/range with min date-dark.png
#	packages/screenshots/testplane/chrome/components/date picker/range with min-max dates/range with min-max dates-dark.png
#	packages/screenshots/testplane/chrome/components/date picker/range/range-dark.png
#	packages/screenshots/testplane/chrome/components/date picker/single date and time/single date and time-dark.png
#	packages/screenshots/testplane/chrome/components/date picker/single date/single date-dark.png
#	packages/screenshots/testplane/chrome/components/date picker/single with max date/single with max date-dark.png
#	packages/screenshots/testplane/chrome/components/date picker/single with min date/single with min date-dark.png
#	packages/screenshots/testplane/chrome/components/date picker/single with min-max dates/single with min-max dates-dark.png
#	packages/screenshots/testplane/chrome/components/date picker/starts on sunday/starts on sunday-dark.png
#	packages/screenshots/testplane/chrome/components/dialog/basic/basic-dark.png
#	packages/screenshots/testplane/chrome/components/dialog/dense/dense-dark.png
#	packages/screenshots/testplane/chrome/components/dialog/native/native-dark.png
#	packages/screenshots/testplane/chrome/components/dialog/with overflow scroll on html/with overflow scroll on html-dark.png
#	packages/screenshots/testplane/chrome/components/dialog/with scroll/with scroll-dark.png
#	packages/screenshots/testplane/chrome/components/dropdown/basic/basic-dark.png
#	packages/screenshots/testplane/chrome/components/dropdown/with activeclassname/with activeclassname-dark.png
#	packages/screenshots/testplane/chrome/components/dropdown/with hover mode/with hover mode-dark.png
#	packages/screenshots/testplane/chrome/components/dropdownmenu/dropdownmenu nested/dropdownmenu nested-dark.png
#	packages/screenshots/testplane/chrome/components/dropdownmenu/dropdownmenu/dropdownmenu-dark.png
#	packages/screenshots/testplane/chrome/components/editable heading/editable heading/editable heading-dark.png
#	packages/screenshots/testplane/chrome/components/error message/error message/error message-dark.png
#	packages/screenshots/testplane/chrome/components/errorbubble/basic/basic-dark.png
#	packages/screenshots/testplane/chrome/components/errorbubble/in dialog form/in dialog form-dark.png
#	packages/screenshots/testplane/chrome/components/icon/all icons list/all icons list-dark.png
#	packages/screenshots/testplane/chrome/components/icon/basic/basic-dark.png
#	packages/screenshots/testplane/chrome/components/icon/in text/in text-dark.png
#	packages/screenshots/testplane/chrome/components/inline loader/with children/with children-dark.png
#	packages/screenshots/testplane/chrome/components/inline loader/without react/without react-dark.png
#	packages/screenshots/testplane/chrome/components/input/basic/basic-dark.png
#	packages/screenshots/testplane/chrome/components/input/height s/height s-dark.png
#	packages/screenshots/testplane/chrome/components/input/select all/select all-dark.png
#	packages/screenshots/testplane/chrome/components/link/link/link-dark.png
#	packages/screenshots/testplane/chrome/components/list/with item icons/with item icons-dark.png
#	packages/screenshots/testplane/chrome/components/markdown/basic/basic-dark.png
#	packages/screenshots/testplane/chrome/components/message/basic/basic-dark.png
#	packages/screenshots/testplane/chrome/components/message/light/light-dark.png
#	packages/screenshots/testplane/chrome/components/message/with narrow anchor/with narrow anchor-dark.png
#	packages/screenshots/testplane/chrome/components/message/with ondissmiss/with ondissmiss-dark.png
#	packages/screenshots/testplane/chrome/components/pager/basic/basic-dark.png
#	packages/screenshots/testplane/chrome/components/pager/open total/open total-dark.png
#	packages/screenshots/testplane/chrome/components/pager/page size selector/page size selector-dark.png
#	packages/screenshots/testplane/chrome/components/popup/auto-positioning/auto-positioning-dark.png
#	packages/screenshots/testplane/chrome/components/popup/basic/basic-dark.png
#	packages/screenshots/testplane/chrome/components/popup/fits screen/fits screen-dark.png
#	packages/screenshots/testplane/chrome/components/query assist/no auth/no auth-dark.png
#	packages/screenshots/testplane/chrome/components/select/button mode with a filter/button mode with a filter-dark.png
#	packages/screenshots/testplane/chrome/components/select/disabled/disabled-dark.png
#	packages/screenshots/testplane/chrome/components/select/height s/height s-dark.png
#	packages/screenshots/testplane/chrome/components/select/inline with a filter/inline with a filter-dark.png
#	packages/screenshots/testplane/chrome/components/select/input-based with error/input-based with error-dark.png
#	packages/screenshots/testplane/chrome/components/select/input-based with filter icon/input-based with filter icon-dark.png
#	packages/screenshots/testplane/chrome/components/select/input-based/input-based-dark.png
#	packages/screenshots/testplane/chrome/components/select/multiple with a description/multiple with a description-dark.png
#	packages/screenshots/testplane/chrome/components/select/with a filter/with a filter-dark.png
#	packages/screenshots/testplane/chrome/components/select/with a large dataset and disabled scroll to active item/with a large dataset and disabled scroll to active item-dark.png
#	packages/screenshots/testplane/chrome/components/select/with avatars/with avatars-dark.png
#	packages/screenshots/testplane/chrome/components/tabs/auto collapsing/auto collapsing-dark.png
#	packages/screenshots/testplane/chrome/components/tabs/custom titles (function)/custom titles (function)-dark.png
#	packages/screenshots/testplane/chrome/components/tabs/custom titles/custom titles-dark.png
#	packages/screenshots/testplane/chrome/components/tag/tag/tag-dark.png
#	packages/screenshots/testplane/chrome/components/tags input/auto open in a dialog/auto open in a dialog-dark.png
#	packages/screenshots/testplane/chrome/components/tags input/auto open/auto open-dark.png
#	packages/screenshots/testplane/chrome/components/tags input/basic/basic-dark.png
#	packages/screenshots/testplane/chrome/components/tags input/with icons/with icons-dark.png
#	packages/screenshots/testplane/chrome/components/tags input/with too long tag labels/with too long tag labels-dark.png
#	packages/screenshots/testplane/chrome/components/tags list/basic/basic-dark.png
#	packages/screenshots/testplane/chrome/components/tags list/with icons/with icons-dark.png
#	packages/screenshots/testplane/chrome/components/toggle/toggle/toggle-dark.png
#	packages/screenshots/testplane/chrome/components/user agreement/dialog/dialog-dark.png
#	packages/screenshots/testplane/chrome/services/confirm service/confirm service/confirm service-dark.png
#	packages/screenshots/testplane/chrome/style-only/old browsers message/old browsers message/old browsers message-dark.png
#	packages/screenshots/testplane/firefox/components/alert/alert container/alert container-dark.png
#	packages/screenshots/testplane/firefox/components/alert/simple/simple-dark.png
#	packages/screenshots/testplane/firefox/components/auth dialog/auth dialog/auth dialog-dark.png
#	packages/screenshots/testplane/firefox/components/avatar/avatar/avatar-dark.png
#	packages/screenshots/testplane/firefox/components/breadcrumbs/default/default-dark.png
#	packages/screenshots/testplane/firefox/components/button group/button group/button group-dark.png
#	packages/screenshots/testplane/firefox/components/button set/button set/button set-dark.png
#	packages/screenshots/testplane/firefox/components/button toolbar/button toolbar/button toolbar-dark.png
#	packages/screenshots/testplane/firefox/components/button/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/button/height l/height l-dark.png
#	packages/screenshots/testplane/firefox/components/button/height s/height s-dark.png
#	packages/screenshots/testplane/firefox/components/checkbox/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/collapse/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/collapse/show content on extending/show content on extending-dark.png
#	packages/screenshots/testplane/firefox/components/collapse/the trigger with icon/the trigger with icon-dark.png
#	packages/screenshots/testplane/firefox/components/collapse/trigger placed under collapsed content/trigger placed under collapsed content-dark.png
#	packages/screenshots/testplane/firefox/components/collapse/with default min height/with default min height-dark.png
#	packages/screenshots/testplane/firefox/components/collapse/with disabled animation/with disabled animation-dark.png
#	packages/screenshots/testplane/firefox/components/collapse/with dynamic content/with dynamic content-dark.png
#	packages/screenshots/testplane/firefox/components/confirm/confirm/confirm-dark.png
#	packages/screenshots/testplane/firefox/components/content layout/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/content layout/with sidebar on the left/with sidebar on the left-dark.png
#	packages/screenshots/testplane/firefox/components/content layout/with sidebar on the right/with sidebar on the right-dark.png
#	packages/screenshots/testplane/firefox/components/contenteditable/contenteditable/contenteditable-dark.png
#	packages/screenshots/testplane/firefox/components/datalist/datalist/datalist-dark.png
#	packages/screenshots/testplane/firefox/components/date picker/all sizes/all sizes-dark.png
#	packages/screenshots/testplane/firefox/components/date picker/clearable/clearable-dark.png
#	packages/screenshots/testplane/firefox/components/date picker/range with max date/range with max date-dark.png
#	packages/screenshots/testplane/firefox/components/date picker/range with min date/range with min date-dark.png
#	packages/screenshots/testplane/firefox/components/date picker/range with min-max dates/range with min-max dates-dark.png
#	packages/screenshots/testplane/firefox/components/date picker/range/range-dark.png
#	packages/screenshots/testplane/firefox/components/date picker/single date and time/single date and time-dark.png
#	packages/screenshots/testplane/firefox/components/date picker/single date/single date-dark.png
#	packages/screenshots/testplane/firefox/components/date picker/single with max date/single with max date-dark.png
#	packages/screenshots/testplane/firefox/components/date picker/single with min date/single with min date-dark.png
#	packages/screenshots/testplane/firefox/components/date picker/single with min-max dates/single with min-max dates-dark.png
#	packages/screenshots/testplane/firefox/components/date picker/starts on sunday/starts on sunday-dark.png
#	packages/screenshots/testplane/firefox/components/dialog/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/dialog/dense/dense-dark.png
#	packages/screenshots/testplane/firefox/components/dialog/native/native-dark.png
#	packages/screenshots/testplane/firefox/components/dialog/with overflow scroll on html/with overflow scroll on html-dark.png
#	packages/screenshots/testplane/firefox/components/dialog/with scroll/with scroll-dark.png
#	packages/screenshots/testplane/firefox/components/dropdown/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/dropdown/with activeclassname/with activeclassname-dark.png
#	packages/screenshots/testplane/firefox/components/dropdown/with custom anchor and popup and content accessibility handling/with custom anchor and popup and content accessibility handling-dark.png
#	packages/screenshots/testplane/firefox/components/dropdown/with custom anchor and popup/with custom anchor and popup-dark.png
#	packages/screenshots/testplane/firefox/components/dropdown/with hover mode/with hover mode-dark.png
#	packages/screenshots/testplane/firefox/components/dropdownmenu/dropdownmenu nested/dropdownmenu nested-dark.png
#	packages/screenshots/testplane/firefox/components/dropdownmenu/dropdownmenu/dropdownmenu-dark.png
#	packages/screenshots/testplane/firefox/components/editable heading/editable heading/editable heading-dark.png
#	packages/screenshots/testplane/firefox/components/error message/error message/error message-dark.png
#	packages/screenshots/testplane/firefox/components/errorbubble/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/errorbubble/in dialog form/in dialog form-dark.png
#	packages/screenshots/testplane/firefox/components/footer/footer/footer-dark.png
#	packages/screenshots/testplane/firefox/components/grid/alignment/alignment-dark.png
#	packages/screenshots/testplane/firefox/components/grid/auto size/auto size-dark.png
#	packages/screenshots/testplane/firefox/components/grid/columns distribution/columns distribution-dark.png
#	packages/screenshots/testplane/firefox/components/grid/offset/offset-dark.png
#	packages/screenshots/testplane/firefox/components/grid/responsive/responsive-dark.png
#	packages/screenshots/testplane/firefox/components/group/group/group-dark.png
#	packages/screenshots/testplane/firefox/components/heading/heading/heading-dark.png
#	packages/screenshots/testplane/firefox/components/icon/all icons list/all icons list-dark.png
#	packages/screenshots/testplane/firefox/components/icon/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/icon/in text/in text-dark.png
#	packages/screenshots/testplane/firefox/components/inline loader/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/inline loader/with children/with children-dark.png
#	packages/screenshots/testplane/firefox/components/inline loader/without react/without react-dark.png
#	packages/screenshots/testplane/firefox/components/input/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/input/height s/height s-dark.png
#	packages/screenshots/testplane/firefox/components/input/select all/select all-dark.png
#	packages/screenshots/testplane/firefox/components/island/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/island/with resizeable header/with resizeable header-dark.png
#	packages/screenshots/testplane/firefox/components/island/with scroll/with scroll-dark.png
#	packages/screenshots/testplane/firefox/components/link/link/link-dark.png
#	packages/screenshots/testplane/firefox/components/list/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/list/list #2/list #2-dark.png
#	packages/screenshots/testplane/firefox/components/list/with a hint below/with a hint below-dark.png
#	packages/screenshots/testplane/firefox/components/list/with custom items/with custom items-dark.png
#	packages/screenshots/testplane/firefox/components/list/with custom tooltip/with custom tooltip-dark.png
#	packages/screenshots/testplane/firefox/components/list/with item icons/with item icons-dark.png
#	packages/screenshots/testplane/firefox/components/markdown/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/message/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/message/light/light-dark.png
#	packages/screenshots/testplane/firefox/components/message/with narrow anchor/with narrow anchor-dark.png
#	packages/screenshots/testplane/firefox/components/message/with ondissmiss/with ondissmiss-dark.png
#	packages/screenshots/testplane/firefox/components/pager/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/pager/open total/open total-dark.png
#	packages/screenshots/testplane/firefox/components/pager/page size selector/page size selector-dark.png
#	packages/screenshots/testplane/firefox/components/panel/panel/panel-dark.png
#	packages/screenshots/testplane/firefox/components/popup/auto-positioning/auto-positioning-dark.png
#	packages/screenshots/testplane/firefox/components/popup/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/popup/fits screen/fits screen-dark.png
#	packages/screenshots/testplane/firefox/components/popup/popup in a popup/popup in a popup-dark.png
#	packages/screenshots/testplane/firefox/components/popupmenu/popupmenu/popupmenu-dark.png
#	packages/screenshots/testplane/firefox/components/query assist/no auth/no auth-dark.png
#	packages/screenshots/testplane/firefox/components/radio/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/radio/disabled/disabled-dark.png
#	packages/screenshots/testplane/firefox/components/radio/multiline/multiline-dark.png
#	packages/screenshots/testplane/firefox/components/select/button mode with a filter/button mode with a filter-dark.png
#	packages/screenshots/testplane/firefox/components/select/disabled/disabled-dark.png
#	packages/screenshots/testplane/firefox/components/select/height s/height s-dark.png
#	packages/screenshots/testplane/firefox/components/select/inline with a filter/inline with a filter-dark.png
#	packages/screenshots/testplane/firefox/components/select/input-based with error/input-based with error-dark.png
#	packages/screenshots/testplane/firefox/components/select/input-based with filter icon/input-based with filter icon-dark.png
#	packages/screenshots/testplane/firefox/components/select/input-based/input-based-dark.png
#	packages/screenshots/testplane/firefox/components/select/multiple with a description/multiple with a description-dark.png
#	packages/screenshots/testplane/firefox/components/select/with a filter/with a filter-dark.png
#	packages/screenshots/testplane/firefox/components/select/with a large dataset and disabled scroll to active item/with a large dataset and disabled scroll to active item-dark.png
#	packages/screenshots/testplane/firefox/components/select/with avatars/with avatars-dark.png
#	packages/screenshots/testplane/firefox/components/slider/range/range-dark.png
#	packages/screenshots/testplane/firefox/components/slider/with custom marks and tag/with custom marks and tag-dark.png
#	packages/screenshots/testplane/firefox/components/slider/with marks/with marks-dark.png
#	packages/screenshots/testplane/firefox/components/slider/with tag/with tag-dark.png
#	packages/screenshots/testplane/firefox/components/slider/with ticks/with ticks-dark.png
#	packages/screenshots/testplane/firefox/components/tabs/auto collapsing/auto collapsing-dark.png
#	packages/screenshots/testplane/firefox/components/tabs/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/tabs/custom titles (function)/custom titles (function)-dark.png
#	packages/screenshots/testplane/firefox/components/tabs/custom titles/custom titles-dark.png
#	packages/screenshots/testplane/firefox/components/tabs/smart/smart-dark.png
#	packages/screenshots/testplane/firefox/components/tag/tag/tag-dark.png
#	packages/screenshots/testplane/firefox/components/tags input/auto open in a dialog/auto open in a dialog-dark.png
#	packages/screenshots/testplane/firefox/components/tags input/auto open/auto open-dark.png
#	packages/screenshots/testplane/firefox/components/tags input/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/tags input/with icons/with icons-dark.png
#	packages/screenshots/testplane/firefox/components/tags input/with too long tag labels/with too long tag labels-dark.png
#	packages/screenshots/testplane/firefox/components/tags list/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/tags list/disabled/disabled-dark.png
#	packages/screenshots/testplane/firefox/components/tags list/with icons/with icons-dark.png
#	packages/screenshots/testplane/firefox/components/text/text/text-dark.png
#	packages/screenshots/testplane/firefox/components/theme provider/theme provider/theme provider-dark.png
#	packages/screenshots/testplane/firefox/components/theme provider/theme provider/theme provider.png
#	packages/screenshots/testplane/firefox/components/toggle/toggle/toggle-dark.png
#	packages/screenshots/testplane/firefox/components/tooltip/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/components/tooltip/displayed when necessary/displayed when necessary-dark.png
#	packages/screenshots/testplane/firefox/components/tooltip/nested/nested-dark.png
#	packages/screenshots/testplane/firefox/components/user agreement/dialog/dialog-dark.png
#	packages/screenshots/testplane/firefox/components/user card/inline/inline-dark.png
#	packages/screenshots/testplane/firefox/services/confirm service/confirm service/confirm service-dark.png
#	packages/screenshots/testplane/firefox/style-only/form/form/form-dark.png
#	packages/screenshots/testplane/firefox/style-only/input sizes/input sizes/input sizes-dark.png
#	packages/screenshots/testplane/firefox/style-only/island/basic/basic-dark.png
#	packages/screenshots/testplane/firefox/style-only/island/with a header and buttons/with a header and buttons-dark.png
#	packages/screenshots/testplane/firefox/style-only/old browsers message/old browsers message/old browsers message-dark.png
#	src/date-picker/date-picker.tsx
#	src/dialog/dialog.tsx
#	src/global/theme.tsx
#	src/global/variables_dark.css
#	src/tooltip/tooltip.tsx
@andrey-skl andrey-skl enabled auto-merge (squash) October 21, 2024 09:35
@andrey-skl andrey-skl merged commit 8804695 into master Oct 21, 2024
3 checks passed
@andrey-skl andrey-skl deleted the master-merge-6.x branch October 24, 2024 10:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants