@salutejs/plasma-new-hope 0.342.0-canary.2260.19623998307.0 → 0.342.0-canary.2260.19662001696.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.
Files changed (64) hide show
  1. package/cjs/components/LinkButton/LinkButton.css +8 -8
  2. package/cjs/components/LinkButton/LinkButton.styles.js +1 -1
  3. package/cjs/components/LinkButton/LinkButton.styles.js.map +1 -1
  4. package/cjs/components/LinkButton/{LinkButton.styles_1q1p1l2.css → LinkButton.styles_1e7vwn3.css} +1 -1
  5. package/cjs/components/LinkButton/LinkButton.tokens.js +1 -0
  6. package/cjs/components/LinkButton/LinkButton.tokens.js.map +1 -1
  7. package/cjs/components/Sheet/Sheet.js +4 -1
  8. package/cjs/components/Sheet/Sheet.js.map +1 -1
  9. package/cjs/components/Sheet/hooks/useSheetSwipe.js +2 -1
  10. package/cjs/components/Sheet/hooks/useSheetSwipe.js.map +1 -1
  11. package/cjs/components/Table/Table.css +8 -8
  12. package/cjs/components/Table/ui/Cell/Cell.css +8 -8
  13. package/cjs/components/Table/ui/EditableCell/EditableCell.css +8 -8
  14. package/cjs/components/Table/ui/HeadCell/HeadCell.css +8 -8
  15. package/cjs/components/Table/ui/HeadCell/ui/Filter/Filter.css +8 -8
  16. package/cjs/index.css +8 -8
  17. package/emotion/cjs/components/LinkButton/LinkButton.styles.js +15 -15
  18. package/emotion/cjs/components/LinkButton/LinkButton.tokens.js +1 -0
  19. package/emotion/cjs/components/Sheet/Sheet.js +3 -1
  20. package/emotion/cjs/components/Sheet/hooks/useSheetSwipe.js +2 -2
  21. package/emotion/cjs/examples/components/LinkButton/LinkButton.config.js +13 -13
  22. package/emotion/es/components/LinkButton/LinkButton.styles.js +15 -15
  23. package/emotion/es/components/LinkButton/LinkButton.tokens.js +1 -0
  24. package/emotion/es/components/Sheet/Sheet.js +3 -1
  25. package/emotion/es/components/Sheet/hooks/useSheetSwipe.js +2 -2
  26. package/emotion/es/examples/components/Combobox/Combobox.js +0 -7
  27. package/emotion/es/examples/components/LinkButton/LinkButton.config.js +13 -13
  28. package/es/components/LinkButton/LinkButton.css +8 -8
  29. package/es/components/LinkButton/LinkButton.styles.js +1 -1
  30. package/es/components/LinkButton/LinkButton.styles.js.map +1 -1
  31. package/es/components/LinkButton/{LinkButton.styles_1q1p1l2.css → LinkButton.styles_1e7vwn3.css} +1 -1
  32. package/es/components/LinkButton/LinkButton.tokens.js +1 -0
  33. package/es/components/LinkButton/LinkButton.tokens.js.map +1 -1
  34. package/es/components/Sheet/Sheet.js +4 -1
  35. package/es/components/Sheet/Sheet.js.map +1 -1
  36. package/es/components/Sheet/hooks/useSheetSwipe.js +2 -1
  37. package/es/components/Sheet/hooks/useSheetSwipe.js.map +1 -1
  38. package/es/components/Table/Table.css +8 -8
  39. package/es/components/Table/ui/Cell/Cell.css +8 -8
  40. package/es/components/Table/ui/EditableCell/EditableCell.css +8 -8
  41. package/es/components/Table/ui/HeadCell/HeadCell.css +8 -8
  42. package/es/components/Table/ui/HeadCell/ui/Filter/Filter.css +8 -8
  43. package/es/index.css +8 -8
  44. package/package.json +5 -5
  45. package/styled-components/cjs/components/LinkButton/LinkButton.styles.js +9 -8
  46. package/styled-components/cjs/components/LinkButton/LinkButton.tokens.js +1 -0
  47. package/styled-components/cjs/components/Sheet/Sheet.js +3 -1
  48. package/styled-components/cjs/components/Sheet/hooks/useSheetSwipe.js +2 -2
  49. package/styled-components/cjs/examples/components/Combobox/Combobox.js +0 -15
  50. package/styled-components/cjs/examples/components/LinkButton/LinkButton.config.js +18 -12
  51. package/styled-components/es/components/LinkButton/LinkButton.styles.js +9 -8
  52. package/styled-components/es/components/LinkButton/LinkButton.tokens.js +1 -0
  53. package/styled-components/es/components/Sheet/Sheet.js +3 -1
  54. package/styled-components/es/components/Sheet/hooks/useSheetSwipe.js +2 -2
  55. package/styled-components/es/examples/components/LinkButton/LinkButton.config.js +18 -12
  56. package/types/components/LinkButton/LinkButton.styles.d.ts.map +1 -1
  57. package/types/components/LinkButton/LinkButton.tokens.d.ts +1 -0
  58. package/types/components/LinkButton/LinkButton.tokens.d.ts.map +1 -1
  59. package/types/components/Sheet/Sheet.d.ts.map +1 -1
  60. package/types/components/Sheet/Sheet.types.d.ts +6 -0
  61. package/types/components/Sheet/Sheet.types.d.ts.map +1 -1
  62. package/types/components/Sheet/hooks/useSheetSwipe.d.ts +1 -0
  63. package/types/components/Sheet/hooks/useSheetSwipe.d.ts.map +1 -1
  64. package/types/examples/components/LinkButton/LinkButton.config.d.ts.map +1 -1
@@ -123,7 +123,7 @@ function _object_without_properties_loose(source, excluded) {
123
123
  }
124
124
  var sheetRoot = function(Root) {
125
125
  return /*#__PURE__*/ (0, _react.forwardRef)(function(_param, rootRef) {
126
- var opened = _param.opened, children = _param.children, onClose = _param.onClose, _param_hasHandle = _param.hasHandle, hasHandle = _param_hasHandle === void 0 ? true : _param_hasHandle, handlePlacement = _param.handlePlacement, contentHeader = _param.contentHeader, _param_isHeaderFixed = _param.isHeaderFixed, isHeaderFixed = _param_isHeaderFixed === void 0 ? false : _param_isHeaderFixed, contentFooter = _param.contentFooter, _param_isFooterFixed = _param.isFooterFixed, isFooterFixed = _param_isFooterFixed === void 0 ? false : _param_isFooterFixed, _param_withOverlay = _param.withOverlay, withOverlay = _param_withOverlay === void 0 ? true : _param_withOverlay, _param_withBlur = _param.withBlur, withBlur = _param_withBlur === void 0 ? false : _param_withBlur, _param_withTransition = _param.withTransition, withTransition = _param_withTransition === void 0 ? true : _param_withTransition, throttleMs = _param.throttleMs, className = _param.className, view = _param.view, restProps = _object_without_properties(_param, [
126
+ var opened = _param.opened, children = _param.children, onClose = _param.onClose, _param_hasHandle = _param.hasHandle, hasHandle = _param_hasHandle === void 0 ? true : _param_hasHandle, handlePlacement = _param.handlePlacement, contentHeader = _param.contentHeader, _param_isHeaderFixed = _param.isHeaderFixed, isHeaderFixed = _param_isHeaderFixed === void 0 ? false : _param_isHeaderFixed, contentFooter = _param.contentFooter, _param_isFooterFixed = _param.isFooterFixed, isFooterFixed = _param_isFooterFixed === void 0 ? false : _param_isFooterFixed, _param_withOverlay = _param.withOverlay, withOverlay = _param_withOverlay === void 0 ? true : _param_withOverlay, _param_withBlur = _param.withBlur, withBlur = _param_withBlur === void 0 ? false : _param_withBlur, _param_withTransition = _param.withTransition, withTransition = _param_withTransition === void 0 ? true : _param_withTransition, _param_hasScrollEvents = _param.hasScrollEvents, hasScrollEvents = _param_hasScrollEvents === void 0 ? true : _param_hasScrollEvents, throttleMs = _param.throttleMs, className = _param.className, view = _param.view, restProps = _object_without_properties(_param, [
127
127
  "opened",
128
128
  "children",
129
129
  "onClose",
@@ -136,6 +136,7 @@ var sheetRoot = function(Root) {
136
136
  "withOverlay",
137
137
  "withBlur",
138
138
  "withTransition",
139
+ "hasScrollEvents",
139
140
  "throttleMs",
140
141
  "className",
141
142
  "view"
@@ -151,6 +152,7 @@ var sheetRoot = function(Root) {
151
152
  contentRef: contentRef,
152
153
  handleRef: handleRef,
153
154
  throttleMs: throttleMs,
155
+ hasScrollEvents: hasScrollEvents,
154
156
  onClose: onClose
155
157
  });
156
158
  var hasHeader = Boolean(contentHeader);
@@ -71,7 +71,7 @@ var isScrollable = function(element) {
71
71
  return style.overflow === 'scroll' || style.overflow === 'auto' || style.overflowY === 'scroll' || style.overflowY === 'auto';
72
72
  };
73
73
  var useSheetSwipe = function(args) {
74
- var contentWrapperRef = args.contentWrapperRef, contentRef = args.contentRef, handleRef = args.handleRef, onClose = args.onClose, _args_throttleMs = args.throttleMs, throttleMs = _args_throttleMs === void 0 ? THROTTLE_DEFAULT_MS : _args_throttleMs;
74
+ var contentWrapperRef = args.contentWrapperRef, contentRef = args.contentRef, handleRef = args.handleRef, hasScrollEvents = args.hasScrollEvents, onClose = args.onClose, _args_throttleMs = args.throttleMs, throttleMs = _args_throttleMs === void 0 ? THROTTLE_DEFAULT_MS : _args_throttleMs;
75
75
  var _useState = _sliced_to_array((0, _react.useState)(true), 2), isTopScroll = _useState[0], setIsTopScroll = _useState[1];
76
76
  var isOverscroll = (0, _react.useRef)(false);
77
77
  var startY = (0, _react.useRef)(0);
@@ -81,7 +81,7 @@ var useSheetSwipe = function(args) {
81
81
  var handleEl = handleRef.current;
82
82
  var contentEl = contentRef.current;
83
83
  var triggerElement = !isTopScroll ? handleEl : contentWrapperEl;
84
- if (!triggerElement || !contentEl || !contentWrapperEl) {
84
+ if (!triggerElement || !contentEl || !contentWrapperEl || !hasScrollEvents) {
85
85
  return;
86
86
  }
87
87
  var nodes = Array.from(contentWrapperEl.querySelectorAll('*'));
@@ -1,16 +1 @@
1
1
  "use strict";
2
- Object.defineProperty(exports, "__esModule", {
3
- value: true
4
- });
5
- Object.defineProperty(exports, "Combobox", {
6
- enumerable: true,
7
- get: function() {
8
- return Combobox;
9
- }
10
- });
11
- var _engines = require("../../../engines");
12
- var _ = require("../../..");
13
- var _Comboboxconfig = require("./Combobox.config");
14
- var mergedConfig = (0, _engines.mergeConfig)(_.comboboxNewConfig, _Comboboxconfig.config);
15
- var ComboboxComponent = (0, _engines.component)(mergedConfig);
16
- var Combobox = ComboboxComponent;
@@ -26,8 +26,9 @@ var config = {
26
26
  ":var(--text-primary-hover);",
27
27
  ":var(--text-primary-active);",
28
28
  ":var(--surface-accent);",
29
- ":var(--text-primary-hover);"
30
- ], _LinkButton.linkButtonTokens.linkButtonColor, _LinkButton.linkButtonTokens.linkButtonIconColor, _LinkButton.linkButtonTokens.linkButtonTextColor, _LinkButton.linkButtonTokens.linkButtonBackgroundColor, _LinkButton.linkButtonTokens.linkButtonColorHover, _LinkButton.linkButtonTokens.linkButtonColorActive, _LinkButton.linkButtonTokens.linkButtonFocusColor, _LinkButton.linkButtonTokens.linkButtonTextColorHover),
29
+ ":var(--text-primary-hover);",
30
+ ":var(--text-primary-active);"
31
+ ], _LinkButton.linkButtonTokens.linkButtonColor, _LinkButton.linkButtonTokens.linkButtonIconColor, _LinkButton.linkButtonTokens.linkButtonTextColor, _LinkButton.linkButtonTokens.linkButtonBackgroundColor, _LinkButton.linkButtonTokens.linkButtonColorHover, _LinkButton.linkButtonTokens.linkButtonColorActive, _LinkButton.linkButtonTokens.linkButtonFocusColor, _LinkButton.linkButtonTokens.linkButtonTextColorHover, _LinkButton.linkButtonTokens.linkButtonTextColorActive),
31
32
  accent: (0, _styledcomponents.css)([
32
33
  "",
33
34
  ":var(--text-accent);",
@@ -37,8 +38,9 @@ var config = {
37
38
  ":var(--text-accent-hover);",
38
39
  ":var(--text-accent-active);",
39
40
  ":var(--surface-accent);",
40
- ":var(--text-accent-hover);"
41
- ], _LinkButton.linkButtonTokens.linkButtonColor, _LinkButton.linkButtonTokens.linkButtonIconColor, _LinkButton.linkButtonTokens.linkButtonTextColor, _LinkButton.linkButtonTokens.linkButtonBackgroundColor, _LinkButton.linkButtonTokens.linkButtonColorHover, _LinkButton.linkButtonTokens.linkButtonColorActive, _LinkButton.linkButtonTokens.linkButtonFocusColor, _LinkButton.linkButtonTokens.linkButtonTextColorHover),
41
+ ":var(--text-accent-hover);",
42
+ ":var(--text-accent-active);"
43
+ ], _LinkButton.linkButtonTokens.linkButtonColor, _LinkButton.linkButtonTokens.linkButtonIconColor, _LinkButton.linkButtonTokens.linkButtonTextColor, _LinkButton.linkButtonTokens.linkButtonBackgroundColor, _LinkButton.linkButtonTokens.linkButtonColorHover, _LinkButton.linkButtonTokens.linkButtonColorActive, _LinkButton.linkButtonTokens.linkButtonFocusColor, _LinkButton.linkButtonTokens.linkButtonTextColorHover, _LinkButton.linkButtonTokens.linkButtonTextColorActive),
42
44
  secondary: (0, _styledcomponents.css)([
43
45
  "",
44
46
  ":var(--text-secondary);",
@@ -48,8 +50,9 @@ var config = {
48
50
  ":var(--text-secondary-hover);",
49
51
  ":var(--text-secondary-active);",
50
52
  ":var(--surface-accent);",
51
- ":var(--text-secondary-hover);"
52
- ], _LinkButton.linkButtonTokens.linkButtonColor, _LinkButton.linkButtonTokens.linkButtonIconColor, _LinkButton.linkButtonTokens.linkButtonTextColor, _LinkButton.linkButtonTokens.linkButtonBackgroundColor, _LinkButton.linkButtonTokens.linkButtonColorHover, _LinkButton.linkButtonTokens.linkButtonColorActive, _LinkButton.linkButtonTokens.linkButtonFocusColor, _LinkButton.linkButtonTokens.linkButtonTextColorHover),
53
+ ":var(--text-secondary-hover);",
54
+ ":var(--text-secondary-active);"
55
+ ], _LinkButton.linkButtonTokens.linkButtonColor, _LinkButton.linkButtonTokens.linkButtonIconColor, _LinkButton.linkButtonTokens.linkButtonTextColor, _LinkButton.linkButtonTokens.linkButtonBackgroundColor, _LinkButton.linkButtonTokens.linkButtonColorHover, _LinkButton.linkButtonTokens.linkButtonColorActive, _LinkButton.linkButtonTokens.linkButtonFocusColor, _LinkButton.linkButtonTokens.linkButtonTextColorHover, _LinkButton.linkButtonTokens.linkButtonTextColorActive),
53
56
  positive: (0, _styledcomponents.css)([
54
57
  "",
55
58
  ":var(--text-positive);",
@@ -59,8 +62,9 @@ var config = {
59
62
  ":var(--text-positive-hover);",
60
63
  ":var(--text-positive-active);",
61
64
  ":var(--surface-accent);",
62
- ":var(--text-positive-hover);"
63
- ], _LinkButton.linkButtonTokens.linkButtonColor, _LinkButton.linkButtonTokens.linkButtonIconColor, _LinkButton.linkButtonTokens.linkButtonTextColor, _LinkButton.linkButtonTokens.linkButtonBackgroundColor, _LinkButton.linkButtonTokens.linkButtonColorHover, _LinkButton.linkButtonTokens.linkButtonColorActive, _LinkButton.linkButtonTokens.linkButtonFocusColor, _LinkButton.linkButtonTokens.linkButtonTextColorHover),
65
+ ":var(--text-positive-hover);",
66
+ ":var(--text-positive-active);"
67
+ ], _LinkButton.linkButtonTokens.linkButtonColor, _LinkButton.linkButtonTokens.linkButtonIconColor, _LinkButton.linkButtonTokens.linkButtonTextColor, _LinkButton.linkButtonTokens.linkButtonBackgroundColor, _LinkButton.linkButtonTokens.linkButtonColorHover, _LinkButton.linkButtonTokens.linkButtonColorActive, _LinkButton.linkButtonTokens.linkButtonFocusColor, _LinkButton.linkButtonTokens.linkButtonTextColorHover, _LinkButton.linkButtonTokens.linkButtonTextColorActive),
64
68
  warning: (0, _styledcomponents.css)([
65
69
  "",
66
70
  ":var(--text-warning);",
@@ -70,8 +74,9 @@ var config = {
70
74
  ":var(--text-warning-hover);",
71
75
  ":var(--text-warning-active);",
72
76
  ":var(--surface-accent);",
73
- ":var(--text-warning-hover);"
74
- ], _LinkButton.linkButtonTokens.linkButtonColor, _LinkButton.linkButtonTokens.linkButtonIconColor, _LinkButton.linkButtonTokens.linkButtonTextColor, _LinkButton.linkButtonTokens.linkButtonBackgroundColor, _LinkButton.linkButtonTokens.linkButtonColorHover, _LinkButton.linkButtonTokens.linkButtonColorActive, _LinkButton.linkButtonTokens.linkButtonFocusColor, _LinkButton.linkButtonTokens.linkButtonTextColorHover),
77
+ ":var(--text-warning-hover);",
78
+ ":var(--text-warning-active);"
79
+ ], _LinkButton.linkButtonTokens.linkButtonColor, _LinkButton.linkButtonTokens.linkButtonIconColor, _LinkButton.linkButtonTokens.linkButtonTextColor, _LinkButton.linkButtonTokens.linkButtonBackgroundColor, _LinkButton.linkButtonTokens.linkButtonColorHover, _LinkButton.linkButtonTokens.linkButtonColorActive, _LinkButton.linkButtonTokens.linkButtonFocusColor, _LinkButton.linkButtonTokens.linkButtonTextColorHover, _LinkButton.linkButtonTokens.linkButtonTextColorActive),
75
80
  negative: (0, _styledcomponents.css)([
76
81
  "",
77
82
  ":var(--text-negative);",
@@ -81,8 +86,9 @@ var config = {
81
86
  ":var(--text-negative-hover);",
82
87
  ":var(--text-negative-active);",
83
88
  ":var(--surface-accent);",
84
- ":var(--text-negative-hover);"
85
- ], _LinkButton.linkButtonTokens.linkButtonColor, _LinkButton.linkButtonTokens.linkButtonIconColor, _LinkButton.linkButtonTokens.linkButtonTextColor, _LinkButton.linkButtonTokens.linkButtonBackgroundColor, _LinkButton.linkButtonTokens.linkButtonColorHover, _LinkButton.linkButtonTokens.linkButtonColorActive, _LinkButton.linkButtonTokens.linkButtonFocusColor, _LinkButton.linkButtonTokens.linkButtonTextColorHover)
89
+ ":var(--text-negative-hover);",
90
+ ":var(--text-negative-active);"
91
+ ], _LinkButton.linkButtonTokens.linkButtonColor, _LinkButton.linkButtonTokens.linkButtonIconColor, _LinkButton.linkButtonTokens.linkButtonTextColor, _LinkButton.linkButtonTokens.linkButtonBackgroundColor, _LinkButton.linkButtonTokens.linkButtonColorHover, _LinkButton.linkButtonTokens.linkButtonColorActive, _LinkButton.linkButtonTokens.linkButtonFocusColor, _LinkButton.linkButtonTokens.linkButtonTextColorHover, _LinkButton.linkButtonTokens.linkButtonTextColorActive)
86
92
  },
87
93
  size: {
88
94
  xl: (0, _styledcomponents.css)([
@@ -17,14 +17,14 @@ export var base = css([
17
17
  }));
18
18
  export var StyledAdditionalContent = styled.div.withConfig({
19
19
  displayName: "LinkButton.styles__StyledAdditionalContent",
20
- componentId: "sc-2c073fa1-0"
20
+ componentId: "sc-e83eddac-0"
21
21
  })([
22
22
  "display:flex;align-items:center;margin:var(",
23
23
  ");"
24
24
  ], tokens.linkButtonAdditionalContentMargin);
25
25
  export var LoadWrap = styled.div.withConfig({
26
26
  displayName: "LinkButton.styles__LoadWrap",
27
- componentId: "sc-2c073fa1-1"
27
+ componentId: "sc-e83eddac-1"
28
28
  })([
29
29
  "opacity:",
30
30
  ";display:flex;align-items:inherit;justify-content:inherit;height:100%;width:100%;"
@@ -34,13 +34,13 @@ export var LoadWrap = styled.div.withConfig({
34
34
  });
35
35
  export var Loader = styled.div.withConfig({
36
36
  displayName: "LinkButton.styles__Loader",
37
- componentId: "sc-2c073fa1-2"
37
+ componentId: "sc-e83eddac-2"
38
38
  })([
39
39
  "position:absolute;"
40
40
  ]);
41
41
  export var StyledSpinner = styled(Spinner).withConfig({
42
42
  displayName: "LinkButton.styles__StyledSpinner",
43
- componentId: "sc-2c073fa1-3"
43
+ componentId: "sc-e83eddac-3"
44
44
  })([
45
45
  "",
46
46
  ":var(",
@@ -50,17 +50,18 @@ export var StyledSpinner = styled(Spinner).withConfig({
50
50
  ], spinnerTokens.size, tokens.linkButtonSpinnerSize, spinnerTokens.color, tokens.linkButtonSpinnerColor);
51
51
  export var LinkButtonText = styled.span.withConfig({
52
52
  displayName: "LinkButton.styles__LinkButtonText",
53
- componentId: "sc-2c073fa1-4"
53
+ componentId: "sc-e83eddac-4"
54
54
  })([
55
55
  "padding:var(",
56
56
  ");color:var(",
57
57
  ");",
58
58
  " &:hover{color:var(",
59
+ ");}&:active{color:var(",
59
60
  ");}"
60
- ], tokens.linkButtonTextPadding, tokens.linkButtonTextColor, applyEllipsis(), tokens.linkButtonTextColorHover);
61
+ ], tokens.linkButtonTextPadding, tokens.linkButtonTextColor, applyEllipsis(), tokens.linkButtonTextColorHover, tokens.linkButtonTextColorActive);
61
62
  export var StyledContentLeft = styled.div.withConfig({
62
63
  displayName: "LinkButton.styles__StyledContentLeft",
63
- componentId: "sc-2c073fa1-5"
64
+ componentId: "sc-e83eddac-5"
64
65
  })([
65
66
  "line-height:0;color:var(",
66
67
  ");margin:var(",
@@ -68,7 +69,7 @@ export var StyledContentLeft = styled.div.withConfig({
68
69
  ], tokens.linkButtonIconColor, tokens.linkButtonLeftContentMargin);
69
70
  export var StyledContentRight = styled.div.withConfig({
70
71
  displayName: "LinkButton.styles__StyledContentRight",
71
- componentId: "sc-2c073fa1-6"
72
+ componentId: "sc-e83eddac-6"
72
73
  })([
73
74
  "line-height:0;color:var(",
74
75
  ");margin:var(",
@@ -6,6 +6,7 @@ export var tokens = {
6
6
  linkButtonColorHover: '--plasma-link-button-color-hover',
7
7
  linkButtonColorActive: '--plasma-link-button-color-active',
8
8
  linkButtonTextColorHover: '--plasma-link-button-text-color-hover',
9
+ linkButtonTextColorActive: '--plasma-link-button-text-color-active',
9
10
  linkButtonPadding: '--plasma-link-button-padding',
10
11
  linkButtonHeight: '--plasma-link-button-height',
11
12
  linkButtonWidth: '--plasma-link-button-width',
@@ -66,7 +66,7 @@ import { DEFAULT_Z_INDEX } from "./utils";
66
66
  * Открывает окно-шторку поверх основного экрана.
67
67
  */ export var sheetRoot = function(Root) {
68
68
  return /*#__PURE__*/ forwardRef(function(_param, rootRef) {
69
- var opened = _param.opened, children = _param.children, onClose = _param.onClose, _param_hasHandle = _param.hasHandle, hasHandle = _param_hasHandle === void 0 ? true : _param_hasHandle, handlePlacement = _param.handlePlacement, contentHeader = _param.contentHeader, _param_isHeaderFixed = _param.isHeaderFixed, isHeaderFixed = _param_isHeaderFixed === void 0 ? false : _param_isHeaderFixed, contentFooter = _param.contentFooter, _param_isFooterFixed = _param.isFooterFixed, isFooterFixed = _param_isFooterFixed === void 0 ? false : _param_isFooterFixed, _param_withOverlay = _param.withOverlay, withOverlay = _param_withOverlay === void 0 ? true : _param_withOverlay, _param_withBlur = _param.withBlur, withBlur = _param_withBlur === void 0 ? false : _param_withBlur, _param_withTransition = _param.withTransition, withTransition = _param_withTransition === void 0 ? true : _param_withTransition, throttleMs = _param.throttleMs, className = _param.className, view = _param.view, restProps = _object_without_properties(_param, [
69
+ var opened = _param.opened, children = _param.children, onClose = _param.onClose, _param_hasHandle = _param.hasHandle, hasHandle = _param_hasHandle === void 0 ? true : _param_hasHandle, handlePlacement = _param.handlePlacement, contentHeader = _param.contentHeader, _param_isHeaderFixed = _param.isHeaderFixed, isHeaderFixed = _param_isHeaderFixed === void 0 ? false : _param_isHeaderFixed, contentFooter = _param.contentFooter, _param_isFooterFixed = _param.isFooterFixed, isFooterFixed = _param_isFooterFixed === void 0 ? false : _param_isFooterFixed, _param_withOverlay = _param.withOverlay, withOverlay = _param_withOverlay === void 0 ? true : _param_withOverlay, _param_withBlur = _param.withBlur, withBlur = _param_withBlur === void 0 ? false : _param_withBlur, _param_withTransition = _param.withTransition, withTransition = _param_withTransition === void 0 ? true : _param_withTransition, _param_hasScrollEvents = _param.hasScrollEvents, hasScrollEvents = _param_hasScrollEvents === void 0 ? true : _param_hasScrollEvents, throttleMs = _param.throttleMs, className = _param.className, view = _param.view, restProps = _object_without_properties(_param, [
70
70
  "opened",
71
71
  "children",
72
72
  "onClose",
@@ -79,6 +79,7 @@ import { DEFAULT_Z_INDEX } from "./utils";
79
79
  "withOverlay",
80
80
  "withBlur",
81
81
  "withTransition",
82
+ "hasScrollEvents",
82
83
  "throttleMs",
83
84
  "className",
84
85
  "view"
@@ -94,6 +95,7 @@ import { DEFAULT_Z_INDEX } from "./utils";
94
95
  contentRef: contentRef,
95
96
  handleRef: handleRef,
96
97
  throttleMs: throttleMs,
98
+ hasScrollEvents: hasScrollEvents,
97
99
  onClose: onClose
98
100
  });
99
101
  var hasHeader = Boolean(contentHeader);
@@ -56,7 +56,7 @@ var isScrollable = function(element) {
56
56
  return style.overflow === 'scroll' || style.overflow === 'auto' || style.overflowY === 'scroll' || style.overflowY === 'auto';
57
57
  };
58
58
  export var useSheetSwipe = function(args) {
59
- var contentWrapperRef = args.contentWrapperRef, contentRef = args.contentRef, handleRef = args.handleRef, onClose = args.onClose, _args_throttleMs = args.throttleMs, throttleMs = _args_throttleMs === void 0 ? THROTTLE_DEFAULT_MS : _args_throttleMs;
59
+ var contentWrapperRef = args.contentWrapperRef, contentRef = args.contentRef, handleRef = args.handleRef, hasScrollEvents = args.hasScrollEvents, onClose = args.onClose, _args_throttleMs = args.throttleMs, throttleMs = _args_throttleMs === void 0 ? THROTTLE_DEFAULT_MS : _args_throttleMs;
60
60
  var _useState = _sliced_to_array(useState(true), 2), isTopScroll = _useState[0], setIsTopScroll = _useState[1];
61
61
  var isOverscroll = useRef(false);
62
62
  var startY = useRef(0);
@@ -66,7 +66,7 @@ export var useSheetSwipe = function(args) {
66
66
  var handleEl = handleRef.current;
67
67
  var contentEl = contentRef.current;
68
68
  var triggerElement = !isTopScroll ? handleEl : contentWrapperEl;
69
- if (!triggerElement || !contentEl || !contentWrapperEl) {
69
+ if (!triggerElement || !contentEl || !contentWrapperEl || !hasScrollEvents) {
70
70
  return;
71
71
  }
72
72
  var nodes = Array.from(contentWrapperEl.querySelectorAll('*'));
@@ -16,8 +16,9 @@ export var config = {
16
16
  ":var(--text-primary-hover);",
17
17
  ":var(--text-primary-active);",
18
18
  ":var(--surface-accent);",
19
- ":var(--text-primary-hover);"
20
- ], linkButtonTokens.linkButtonColor, linkButtonTokens.linkButtonIconColor, linkButtonTokens.linkButtonTextColor, linkButtonTokens.linkButtonBackgroundColor, linkButtonTokens.linkButtonColorHover, linkButtonTokens.linkButtonColorActive, linkButtonTokens.linkButtonFocusColor, linkButtonTokens.linkButtonTextColorHover),
19
+ ":var(--text-primary-hover);",
20
+ ":var(--text-primary-active);"
21
+ ], linkButtonTokens.linkButtonColor, linkButtonTokens.linkButtonIconColor, linkButtonTokens.linkButtonTextColor, linkButtonTokens.linkButtonBackgroundColor, linkButtonTokens.linkButtonColorHover, linkButtonTokens.linkButtonColorActive, linkButtonTokens.linkButtonFocusColor, linkButtonTokens.linkButtonTextColorHover, linkButtonTokens.linkButtonTextColorActive),
21
22
  accent: css([
22
23
  "",
23
24
  ":var(--text-accent);",
@@ -27,8 +28,9 @@ export var config = {
27
28
  ":var(--text-accent-hover);",
28
29
  ":var(--text-accent-active);",
29
30
  ":var(--surface-accent);",
30
- ":var(--text-accent-hover);"
31
- ], linkButtonTokens.linkButtonColor, linkButtonTokens.linkButtonIconColor, linkButtonTokens.linkButtonTextColor, linkButtonTokens.linkButtonBackgroundColor, linkButtonTokens.linkButtonColorHover, linkButtonTokens.linkButtonColorActive, linkButtonTokens.linkButtonFocusColor, linkButtonTokens.linkButtonTextColorHover),
31
+ ":var(--text-accent-hover);",
32
+ ":var(--text-accent-active);"
33
+ ], linkButtonTokens.linkButtonColor, linkButtonTokens.linkButtonIconColor, linkButtonTokens.linkButtonTextColor, linkButtonTokens.linkButtonBackgroundColor, linkButtonTokens.linkButtonColorHover, linkButtonTokens.linkButtonColorActive, linkButtonTokens.linkButtonFocusColor, linkButtonTokens.linkButtonTextColorHover, linkButtonTokens.linkButtonTextColorActive),
32
34
  secondary: css([
33
35
  "",
34
36
  ":var(--text-secondary);",
@@ -38,8 +40,9 @@ export var config = {
38
40
  ":var(--text-secondary-hover);",
39
41
  ":var(--text-secondary-active);",
40
42
  ":var(--surface-accent);",
41
- ":var(--text-secondary-hover);"
42
- ], linkButtonTokens.linkButtonColor, linkButtonTokens.linkButtonIconColor, linkButtonTokens.linkButtonTextColor, linkButtonTokens.linkButtonBackgroundColor, linkButtonTokens.linkButtonColorHover, linkButtonTokens.linkButtonColorActive, linkButtonTokens.linkButtonFocusColor, linkButtonTokens.linkButtonTextColorHover),
43
+ ":var(--text-secondary-hover);",
44
+ ":var(--text-secondary-active);"
45
+ ], linkButtonTokens.linkButtonColor, linkButtonTokens.linkButtonIconColor, linkButtonTokens.linkButtonTextColor, linkButtonTokens.linkButtonBackgroundColor, linkButtonTokens.linkButtonColorHover, linkButtonTokens.linkButtonColorActive, linkButtonTokens.linkButtonFocusColor, linkButtonTokens.linkButtonTextColorHover, linkButtonTokens.linkButtonTextColorActive),
43
46
  positive: css([
44
47
  "",
45
48
  ":var(--text-positive);",
@@ -49,8 +52,9 @@ export var config = {
49
52
  ":var(--text-positive-hover);",
50
53
  ":var(--text-positive-active);",
51
54
  ":var(--surface-accent);",
52
- ":var(--text-positive-hover);"
53
- ], linkButtonTokens.linkButtonColor, linkButtonTokens.linkButtonIconColor, linkButtonTokens.linkButtonTextColor, linkButtonTokens.linkButtonBackgroundColor, linkButtonTokens.linkButtonColorHover, linkButtonTokens.linkButtonColorActive, linkButtonTokens.linkButtonFocusColor, linkButtonTokens.linkButtonTextColorHover),
55
+ ":var(--text-positive-hover);",
56
+ ":var(--text-positive-active);"
57
+ ], linkButtonTokens.linkButtonColor, linkButtonTokens.linkButtonIconColor, linkButtonTokens.linkButtonTextColor, linkButtonTokens.linkButtonBackgroundColor, linkButtonTokens.linkButtonColorHover, linkButtonTokens.linkButtonColorActive, linkButtonTokens.linkButtonFocusColor, linkButtonTokens.linkButtonTextColorHover, linkButtonTokens.linkButtonTextColorActive),
54
58
  warning: css([
55
59
  "",
56
60
  ":var(--text-warning);",
@@ -60,8 +64,9 @@ export var config = {
60
64
  ":var(--text-warning-hover);",
61
65
  ":var(--text-warning-active);",
62
66
  ":var(--surface-accent);",
63
- ":var(--text-warning-hover);"
64
- ], linkButtonTokens.linkButtonColor, linkButtonTokens.linkButtonIconColor, linkButtonTokens.linkButtonTextColor, linkButtonTokens.linkButtonBackgroundColor, linkButtonTokens.linkButtonColorHover, linkButtonTokens.linkButtonColorActive, linkButtonTokens.linkButtonFocusColor, linkButtonTokens.linkButtonTextColorHover),
67
+ ":var(--text-warning-hover);",
68
+ ":var(--text-warning-active);"
69
+ ], linkButtonTokens.linkButtonColor, linkButtonTokens.linkButtonIconColor, linkButtonTokens.linkButtonTextColor, linkButtonTokens.linkButtonBackgroundColor, linkButtonTokens.linkButtonColorHover, linkButtonTokens.linkButtonColorActive, linkButtonTokens.linkButtonFocusColor, linkButtonTokens.linkButtonTextColorHover, linkButtonTokens.linkButtonTextColorActive),
65
70
  negative: css([
66
71
  "",
67
72
  ":var(--text-negative);",
@@ -71,8 +76,9 @@ export var config = {
71
76
  ":var(--text-negative-hover);",
72
77
  ":var(--text-negative-active);",
73
78
  ":var(--surface-accent);",
74
- ":var(--text-negative-hover);"
75
- ], linkButtonTokens.linkButtonColor, linkButtonTokens.linkButtonIconColor, linkButtonTokens.linkButtonTextColor, linkButtonTokens.linkButtonBackgroundColor, linkButtonTokens.linkButtonColorHover, linkButtonTokens.linkButtonColorActive, linkButtonTokens.linkButtonFocusColor, linkButtonTokens.linkButtonTextColorHover)
79
+ ":var(--text-negative-hover);",
80
+ ":var(--text-negative-active);"
81
+ ], linkButtonTokens.linkButtonColor, linkButtonTokens.linkButtonIconColor, linkButtonTokens.linkButtonTextColor, linkButtonTokens.linkButtonBackgroundColor, linkButtonTokens.linkButtonColorHover, linkButtonTokens.linkButtonColorActive, linkButtonTokens.linkButtonFocusColor, linkButtonTokens.linkButtonTextColorHover, linkButtonTokens.linkButtonTextColorActive)
76
82
  },
77
83
  size: {
78
84
  xl: css([
@@ -1 +1 @@
1
- {"version":3,"file":"LinkButton.styles.d.ts","sourceRoot":"","sources":["../../../src/components/LinkButton/LinkButton.styles.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,IAAI,0CAoBhB,CAAC;AAEF,eAAO,MAAM,uBAAuB,qKAInC,CAAC;AAEF,eAAO,MAAM,QAAQ;gBAA4B,OAAO;EAOvD,CAAC;AAEF,eAAO,MAAM,MAAM,qKAElB,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;oDAGzB,CAAC;AAEF,eAAO,MAAM,cAAc,uKAS1B,CAAC;AAEF,eAAO,MAAM,iBAAiB,qKAK7B,CAAC;AAEF,eAAO,MAAM,kBAAkB,qKAK9B,CAAC"}
1
+ {"version":3,"file":"LinkButton.styles.d.ts","sourceRoot":"","sources":["../../../src/components/LinkButton/LinkButton.styles.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,IAAI,0CAoBhB,CAAC;AAEF,eAAO,MAAM,uBAAuB,qKAInC,CAAC;AAEF,eAAO,MAAM,QAAQ;gBAA4B,OAAO;EAOvD,CAAC;AAEF,eAAO,MAAM,MAAM,qKAElB,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;oDAGzB,CAAC;AAEF,eAAO,MAAM,cAAc,uKAa1B,CAAC;AAEF,eAAO,MAAM,iBAAiB,qKAK7B,CAAC;AAEF,eAAO,MAAM,kBAAkB,qKAK9B,CAAC"}
@@ -6,6 +6,7 @@ export declare const tokens: {
6
6
  linkButtonColorHover: string;
7
7
  linkButtonColorActive: string;
8
8
  linkButtonTextColorHover: string;
9
+ linkButtonTextColorActive: string;
9
10
  linkButtonPadding: string;
10
11
  linkButtonHeight: string;
11
12
  linkButtonWidth: string;
@@ -1 +1 @@
1
- {"version":3,"file":"LinkButton.tokens.d.ts","sourceRoot":"","sources":["../../../src/components/LinkButton/LinkButton.tokens.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;CA+BlB,CAAC"}
1
+ {"version":3,"file":"LinkButton.tokens.d.ts","sourceRoot":"","sources":["../../../src/components/LinkButton/LinkButton.tokens.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgClB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"Sheet.d.ts","sourceRoot":"","sources":["../../../src/components/Sheet/Sheet.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6B,MAAM,OAAO,CAAC;AAElD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAI1C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAe3C;;GAEG;AAEH,eAAO,MAAM,SAAS,SAAU,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,sFAuEhE,CAAC;AAEN,eAAO,MAAM,WAAW;;;mBAzEQ,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC;;;;;;;;;;;;;;CA0FpE,CAAC"}
1
+ {"version":3,"file":"Sheet.d.ts","sourceRoot":"","sources":["../../../src/components/Sheet/Sheet.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6B,MAAM,OAAO,CAAC;AAElD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAI1C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAe3C;;GAEG;AAEH,eAAO,MAAM,SAAS,SAAU,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,sFAwEhE,CAAC;AAEN,eAAO,MAAM,WAAW;;;mBA1EQ,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC;;;;;;;;;;;;;;CA2FpE,CAAC"}
@@ -62,6 +62,12 @@ export interface SheetProps extends HTMLAttributes<HTMLDivElement> {
62
62
  * Throttling внутренних обработчиков события onScroll
63
63
  */
64
64
  throttleMs?: number;
65
+ /**
66
+ * Наличие событий скролла
67
+ * @default
68
+ * true
69
+ */
70
+ hasScrollEvents?: boolean;
65
71
  view?: string;
66
72
  }
67
73
  export type CommonProps = Pick<SheetProps, 'withTransition' | 'opened'>;
@@ -1 +1 @@
1
- {"version":3,"file":"Sheet.types.d.ts","sourceRoot":"","sources":["../../../src/components/Sheet/Sheet.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAEvD,MAAM,WAAW,UAAW,SAAQ,cAAc,CAAC,cAAc,CAAC;IAC9D;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,OAAO,EAAE,MAAM,IAAI,CAAC;IAEpB;;OAEG;IACH,aAAa,CAAC,EAAE,SAAS,CAAC;IAE1B;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;OAEG;IACH,aAAa,CAAC,EAAE,SAAS,CAAC;IAE1B;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,EAAE,gBAAgB,GAAG,QAAQ,CAAC,CAAC;AAExE,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC"}
1
+ {"version":3,"file":"Sheet.types.d.ts","sourceRoot":"","sources":["../../../src/components/Sheet/Sheet.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAEvD,MAAM,WAAW,UAAW,SAAQ,cAAc,CAAC,cAAc,CAAC;IAC9D;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,OAAO,EAAE,MAAM,IAAI,CAAC;IAEpB;;OAEG;IACH,aAAa,CAAC,EAAE,SAAS,CAAC;IAE1B;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;OAEG;IACH,aAAa,CAAC,EAAE,SAAS,CAAC;IAE1B;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,EAAE,gBAAgB,GAAG,QAAQ,CAAC,CAAC;AAExE,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC"}
@@ -4,6 +4,7 @@ export declare const useSheetSwipe: (args: {
4
4
  contentRef: RefObject<HTMLDivElement>;
5
5
  handleRef: RefObject<HTMLDivElement>;
6
6
  throttleMs?: number;
7
+ hasScrollEvents?: boolean;
7
8
  onClose: () => void;
8
9
  }) => void;
9
10
  //# sourceMappingURL=useSheetSwipe.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"useSheetSwipe.d.ts","sourceRoot":"","sources":["../../../../src/components/Sheet/hooks/useSheetSwipe.ts"],"names":[],"mappings":"AACA,OAAO,EAA+B,SAAS,EAAE,MAAM,OAAO,CAAC;AAoB/D,eAAO,MAAM,aAAa,SAAU;IAChC,iBAAiB,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;IAC7C,UAAU,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;IACtC,SAAS,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB,SA4FA,CAAC"}
1
+ {"version":3,"file":"useSheetSwipe.d.ts","sourceRoot":"","sources":["../../../../src/components/Sheet/hooks/useSheetSwipe.ts"],"names":[],"mappings":"AACA,OAAO,EAA+B,SAAS,EAAE,MAAM,OAAO,CAAC;AAoB/D,eAAO,MAAM,aAAa,SAAU;IAChC,iBAAiB,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;IAC7C,UAAU,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;IACtC,SAAS,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB,SAmGA,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"LinkButton.config.d.ts","sourceRoot":"","sources":["../../../../src/examples/components/LinkButton/LinkButton.config.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;CA6LlB,CAAC"}
1
+ {"version":3,"file":"LinkButton.config.d.ts","sourceRoot":"","sources":["../../../../src/examples/components/LinkButton/LinkButton.config.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;CAmMlB,CAAC"}