@salutejs/plasma-new-hope 0.264.0-canary.1760.13286965233.0 → 0.264.1-canary.1775.13296417008.0

package/styled-components/cjs/components/Popover/Popover.js

@@ -13,6 +13,7 @@ var _Portal = /*#__PURE__*/require("../Portal");
 var _base = /*#__PURE__*/require("./variations/_view/base");
 var _Popover = /*#__PURE__*/require("./Popover.styles");
 var _Popover2 = /*#__PURE__*/require("./Popover.tokens");
+var _usePopoverOffset = /*#__PURE__*/require("./hooks/usePopoverOffset");
 var _excluded = ["target", "children", "animated", "isOpen", "opened", "trigger", "hasArrow", "frame", "className", "placement", "offset", "zIndex", "isFocusTrapped", "closeOnEsc", "preventOverflow", "usePortal", "view", "onToggle", "closeOnOverlayClick"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
@@ -74,6 +75,7 @@ var popoverRoot = exports.popoverRoot = function popoverRoot(Root) {
     var popoverRef = (0, _react.useRef)(null);
     var handleRef = (0, _plasmaCore.useForkRef)(rootRef, outerRootRef);
     var portalRef = (0, _react.useRef)(null);
+    var targetRef = (0, _react.useRef)(null);
     var trapRef = (0, _hooks.useFocusTrap)(innerIsOpen && isFocusTrapped);
     var popoverForkRef = (0, _plasmaCore.useForkRef)(popoverRef, trapRef);
     var _useState = (0, _react.useState)(null),
@@ -92,6 +94,16 @@ var popoverRoot = exports.popoverRoot = function popoverRoot(Root) {
     var isAuto = isAutoArray || placement.startsWith('auto');
     var openClass = innerIsOpen && shouldRender ? _Popover2.classes.open : undefined;
     var animatedClass = animated ? _Popover2.classes.animate : undefined;
+    var offsetInner = (0, _usePopoverOffset.usePopoverOffset)({
+      handleRef: targetRef,
+      placement: placement,
+      offsetOuter: offset
+    });
+
+    // console.log(offsetInner);
+    // const offsetInner = [7, 8];
+
+    console.log(offsetInner);
     var _usePopper = (0, _reactPopper.usePopper)(rootRef.current, popoverRef.current, {
         // TODO: #1121
         // eslint-disable-next-line no-nested-ternary
@@ -104,7 +116,7 @@ var popoverRoot = exports.popoverRoot = function popoverRoot(Root) {
         }, {
           name: 'offset',
           options: {
-            offset: [offset[0], offset[1]]
+            offset: [offsetInner[0], offsetInner[1]]
           }
         }, {
           name: 'flip',
@@ -235,7 +247,8 @@ var popoverRoot = exports.popoverRoot = function popoverRoot(Root) {
     }, /*#__PURE__*/_react["default"].createElement(_Popover.StyledWrapper, {
       className: (0, _utils.cx)(_Popover2.classes.wrapper, ! /*#__PURE__*/(0, _react.isValidElement)(target) && _Popover2.classes.targetAsRef),
       onMouseEnter: onMouseEnter,
-      onMouseLeave: onMouseLeave
+      onMouseLeave: onMouseLeave,
+      ref: targetRef
     }, /*#__PURE__*/_react["default"].createElement(_Popover.StyledRoot, {
       ref: handleRef,
       onClick: onClick,

package/styled-components/cjs/components/Popover/hooks/usePopoverOffset.js

@@ -0,0 +1,48 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.usePopoverOffset = void 0;
+var _react = /*#__PURE__*/require("react");
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+var allowedPlacements = ['top-start', 'top-end', 'bottom-start', 'bottom-end', 'left-start', 'left-end', 'right-start', 'right-end'];
+var usePopoverOffset = exports.usePopoverOffset = function usePopoverOffset(_ref) {
+  var handleRef = _ref.handleRef,
+    placement = _ref.placement,
+    offsetOuter = _ref.offsetOuter;
+  var _useState = (0, _react.useState)(offsetOuter),
+    _useState2 = _slicedToArray(_useState, 2),
+    offset = _useState2[0],
+    setOffset = _useState2[1];
+  (0, _react.useEffect)(function () {
+    var refElement = handleRef.current;
+    if (!refElement || !allowedPlacements.includes(placement)) {
+      setOffset(offsetOuter);
+      return;
+    }
+    var _refElement$getBoundi = refElement.getBoundingClientRect(),
+      width = _refElement$getBoundi.width,
+      height = _refElement$getBoundi.height;
+    var isVertical = (placement === null || placement === void 0 ? void 0 : placement.startsWith('top')) || (placement === null || placement === void 0 ? void 0 : placement.startsWith('bottom'));
+    var isEnd = placement === null || placement === void 0 ? void 0 : placement.endsWith('end');
+    var isStart = placement === null || placement === void 0 ? void 0 : placement.endsWith('start');
+    var offsetX = offsetOuter[0];
+    var offsetY = offsetOuter[1];
+    if (isVertical) {
+      if ((isStart || isEnd) && width < 28) {
+        offsetX = isEnd ? 17 - width / 2 + offsetOuter[0] : -17 + width / 2 - offsetOuter[0];
+      }
+    }
+    if (!isVertical && (isStart || isEnd) && height < 28) {
+      offsetX = isStart ? -19 + height / 2 : 19 - height / 2;
+    }
+    setOffset([offsetX, offsetY]);
+  }, [handleRef, placement, offsetOuter]);
+  return offset;
+};

package/styled-components/cjs/components/Tooltip/Tooltip.js

@@ -52,7 +52,7 @@ var tooltipRoot = exports.tooltipRoot = function tooltipRoot(Root) {
       arrow = _ref.arrow,
       animated = _ref.animated,
       _ref$offset = _ref.offset,
-      offset = _ref$offset === void 0 ? [0, 8] : _ref$offset,
+      offset = _ref$offset === void 0 ? [3, 8] : _ref$offset,
       minWidth = _ref.minWidth,
       maxWidth = _ref.maxWidth,
       _ref$placement = _ref.placement,

package/styled-components/cjs/examples/plasma_b2c/components/Popover/Popover.stories.tsx

@@ -5,8 +5,30 @@ import type { StoryObj, Meta } from '@storybook/react';
 
 import { Button } from '../Button/Button';
 import { WithTheme } from '../../../_helpers';
+import { IconDisclosureRight } from '../../../../components/_Icon';
+import { IconButton } from '../IconButton/IconButton';
 
-import { Popover } from './Popover';
+import { Popover, PopoverPlacement } from './Popover';
+
+const placements: Array<PopoverPlacement> = [
+    'top',
+    'top-start',
+    'top-end',
+
+    'bottom',
+    'bottom-start',
+    'bottom-end',
+
+    'left',
+    'left-start',
+    'left-end',
+
+    'right',
+    'right-start',
+    'right-end',
+
+    'auto',
+];
 
 import './style.css';
 
@@ -16,7 +38,7 @@ const meta: Meta<typeof Popover> = {
     component: Popover,
     argTypes: {
         placement: {
-            options: ['top', 'bottom', 'right', 'left', 'auto'],
+            options: placements,
             control: {
                 type: 'select',
             },
@@ -116,5 +138,56 @@ const StoryDefault = (args: StoryPopoverProps) => {
 };
 
 export const Default: StoryObj<StoryPopoverProps> = {
+    args: {
+        placement: 'bottom-start',
+    },
     render: (args) => <StoryDefault {...args} />,
 };
+
+const StoryIcon = (args: StoryPopoverProps) => {
+    const { skidding = 0, distance = 0 } = args;
+
+    const [isOpen, setIsOpen] = useState(false);
+
+    return (
+        <div
+            style={{
+                marginLeft: '250px',
+                marginTop: '250px',
+            }}
+        >
+            <Popover
+                opened={isOpen}
+                onToggle={(is) => setIsOpen(is)}
+                frame="theme-root"
+                usePortal={false}
+                role="presentation"
+                id="popover"
+                target={
+                    <IconButton
+                        size="xs"
+                        view="success"
+                        style={{
+                            width: '1rem',
+                            height: '1rem',
+                        }}
+                    >
+                        <IconDisclosureRight size="xs" />
+                    </IconButton>
+                }
+                offset={[skidding, distance]}
+                {...args}
+                distance={6}
+            >
+                <StyledContent>
+                    <>Content</>
+                    <Button onClick={() => setIsOpen(false)}>Close</Button>
+                </StyledContent>
+            </Popover>
+        </div>
+    );
+};
+
+export const Icon: StoryObj<StoryPopoverProps> = {
+    render: (args) => <StoryIcon {...args} />,
+};

package/styled-components/es/components/Popover/Popover.js

@@ -23,6 +23,7 @@ import { Portal } from '../Portal';
 import { base as viewCSS } from './variations/_view/base';
 import { StyledArrow, StyledPopover, StyledRoot, StyledWrapper } from './Popover.styles';
 import { classes } from './Popover.tokens';
+import { usePopoverOffset } from './hooks/usePopoverOffset';
 export var ESCAPE_KEYCODE = 27;
 export var POPOVER_PORTAL_ID = 'plasma-popover-root';
 
@@ -66,6 +67,7 @@ export var popoverRoot = function popoverRoot(Root) {
     var popoverRef = useRef(null);
     var handleRef = useForkRef(rootRef, outerRootRef);
     var portalRef = useRef(null);
+    var targetRef = useRef(null);
     var trapRef = useFocusTrap(innerIsOpen && isFocusTrapped);
     var popoverForkRef = useForkRef(popoverRef, trapRef);
     var _useState = useState(null),
@@ -84,6 +86,16 @@ export var popoverRoot = function popoverRoot(Root) {
     var isAuto = isAutoArray || placement.startsWith('auto');
     var openClass = innerIsOpen && shouldRender ? classes.open : undefined;
     var animatedClass = animated ? classes.animate : undefined;
+    var offsetInner = usePopoverOffset({
+      handleRef: targetRef,
+      placement: placement,
+      offsetOuter: offset
+    });
+
+    // console.log(offsetInner);
+    // const offsetInner = [7, 8];
+
+    console.log(offsetInner);
     var _usePopper = usePopper(rootRef.current, popoverRef.current, {
         // TODO: #1121
         // eslint-disable-next-line no-nested-ternary
@@ -96,7 +108,7 @@ export var popoverRoot = function popoverRoot(Root) {
         }, {
           name: 'offset',
           options: {
-            offset: [offset[0], offset[1]]
+            offset: [offsetInner[0], offsetInner[1]]
           }
         }, {
           name: 'flip',
@@ -227,7 +239,8 @@ export var popoverRoot = function popoverRoot(Root) {
     }, /*#__PURE__*/React.createElement(StyledWrapper, {
       className: cx(classes.wrapper, ! /*#__PURE__*/isValidElement(target) && classes.targetAsRef),
       onMouseEnter: onMouseEnter,
-      onMouseLeave: onMouseLeave
+      onMouseLeave: onMouseLeave,
+      ref: targetRef
     }, /*#__PURE__*/React.createElement(StyledRoot, {
       ref: handleRef,
       onClick: onClick,

package/styled-components/es/components/Popover/hooks/usePopoverOffset.js

@@ -0,0 +1,42 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { useEffect, useState } from 'react';
+var allowedPlacements = ['top-start', 'top-end', 'bottom-start', 'bottom-end', 'left-start', 'left-end', 'right-start', 'right-end'];
+export var usePopoverOffset = function usePopoverOffset(_ref) {
+  var handleRef = _ref.handleRef,
+    placement = _ref.placement,
+    offsetOuter = _ref.offsetOuter;
+  var _useState = useState(offsetOuter),
+    _useState2 = _slicedToArray(_useState, 2),
+    offset = _useState2[0],
+    setOffset = _useState2[1];
+  useEffect(function () {
+    var refElement = handleRef.current;
+    if (!refElement || !allowedPlacements.includes(placement)) {
+      setOffset(offsetOuter);
+      return;
+    }
+    var _refElement$getBoundi = refElement.getBoundingClientRect(),
+      width = _refElement$getBoundi.width,
+      height = _refElement$getBoundi.height;
+    var isVertical = (placement === null || placement === void 0 ? void 0 : placement.startsWith('top')) || (placement === null || placement === void 0 ? void 0 : placement.startsWith('bottom'));
+    var isEnd = placement === null || placement === void 0 ? void 0 : placement.endsWith('end');
+    var isStart = placement === null || placement === void 0 ? void 0 : placement.endsWith('start');
+    var offsetX = offsetOuter[0];
+    var offsetY = offsetOuter[1];
+    if (isVertical) {
+      if ((isStart || isEnd) && width < 28) {
+        offsetX = isEnd ? 17 - width / 2 + offsetOuter[0] : -17 + width / 2 - offsetOuter[0];
+      }
+    }
+    if (!isVertical && (isStart || isEnd) && height < 28) {
+      offsetX = isStart ? -19 + height / 2 : 19 - height / 2;
+    }
+    setOffset([offsetX, offsetY]);
+  }, [handleRef, placement, offsetOuter]);
+  return offset;
+};

package/styled-components/es/components/Tooltip/Tooltip.js

@@ -42,7 +42,7 @@ export var tooltipRoot = function tooltipRoot(Root) {
       arrow = _ref.arrow,
       animated = _ref.animated,
       _ref$offset = _ref.offset,
-      offset = _ref$offset === void 0 ? [0, 8] : _ref$offset,
+      offset = _ref$offset === void 0 ? [3, 8] : _ref$offset,
       minWidth = _ref.minWidth,
       maxWidth = _ref.maxWidth,
       _ref$placement = _ref.placement,

package/styled-components/es/examples/plasma_b2c/components/Popover/Popover.stories.tsx

@@ -5,8 +5,30 @@ import type { StoryObj, Meta } from '@storybook/react';
 
 import { Button } from '../Button/Button';
 import { WithTheme } from '../../../_helpers';
+import { IconDisclosureRight } from '../../../../components/_Icon';
+import { IconButton } from '../IconButton/IconButton';
 
-import { Popover } from './Popover';
+import { Popover, PopoverPlacement } from './Popover';
+
+const placements: Array<PopoverPlacement> = [
+    'top',
+    'top-start',
+    'top-end',
+
+    'bottom',
+    'bottom-start',
+    'bottom-end',
+
+    'left',
+    'left-start',
+    'left-end',
+
+    'right',
+    'right-start',
+    'right-end',
+
+    'auto',
+];
 
 import './style.css';
 
@@ -16,7 +38,7 @@ const meta: Meta<typeof Popover> = {
     component: Popover,
     argTypes: {
         placement: {
-            options: ['top', 'bottom', 'right', 'left', 'auto'],
+            options: placements,
             control: {
                 type: 'select',
             },
@@ -116,5 +138,56 @@ const StoryDefault = (args: StoryPopoverProps) => {
 };
 
 export const Default: StoryObj<StoryPopoverProps> = {
+    args: {
+        placement: 'bottom-start',
+    },
     render: (args) => <StoryDefault {...args} />,
 };
+
+const StoryIcon = (args: StoryPopoverProps) => {
+    const { skidding = 0, distance = 0 } = args;
+
+    const [isOpen, setIsOpen] = useState(false);
+
+    return (
+        <div
+            style={{
+                marginLeft: '250px',
+                marginTop: '250px',
+            }}
+        >
+            <Popover
+                opened={isOpen}
+                onToggle={(is) => setIsOpen(is)}
+                frame="theme-root"
+                usePortal={false}
+                role="presentation"
+                id="popover"
+                target={
+                    <IconButton
+                        size="xs"
+                        view="success"
+                        style={{
+                            width: '1rem',
+                            height: '1rem',
+                        }}
+                    >
+                        <IconDisclosureRight size="xs" />
+                    </IconButton>
+                }
+                offset={[skidding, distance]}
+                {...args}
+                distance={6}
+            >
+                <StyledContent>
+                    <>Content</>
+                    <Button onClick={() => setIsOpen(false)}>Close</Button>
+                </StyledContent>
+            </Popover>
+        </div>
+    );
+};
+
+export const Icon: StoryObj<StoryPopoverProps> = {
+    render: (args) => <StoryIcon {...args} />,
+};

package/types/components/Popover/Popover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Popover.d.ts","sourceRoot":"","sources":["../../../src/components/Popover/Popover.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+E,MAAM,OAAO,CAAC;AAIpG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAMrD,OAAO,KAAK,EAAoB,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAItE,eAAO,MAAM,cAAc,KAAK,CAAC;AACjC,eAAO,MAAM,iBAAiB,wBAAwB,CAAC;AAEvD;;;GAGG;AACH,eAAO,MAAM,WAAW,SAAU,UAAU,cAAc,EAAE,YAAY,CAAC,+JAgRpE,CAAC;AAEN,eAAO,MAAM,aAAa;;;mBAlRQ,UAAU,cAAc,EAAE,YAAY,CAAC;;;;;;;;;;CA+RxE,CAAC"}
+{"version":3,"file":"Popover.d.ts","sourceRoot":"","sources":["../../../src/components/Popover/Popover.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+E,MAAM,OAAO,CAAC;AAIpG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAMrD,OAAO,KAAK,EAAoB,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAKtE,eAAO,MAAM,cAAc,KAAK,CAAC;AACjC,eAAO,MAAM,iBAAiB,wBAAwB,CAAC;AAEvD;;;GAGG;AACH,eAAO,MAAM,WAAW,SAAU,UAAU,cAAc,EAAE,YAAY,CAAC,+JA6RpE,CAAC;AAEN,eAAO,MAAM,aAAa;;;mBA/RQ,UAAU,cAAc,EAAE,YAAY,CAAC;;;;;;;;;;CA4SxE,CAAC"}

package/types/components/Popover/hooks/usePopoverOffset.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="react" />
+interface UsePopoverOffsetOptions {
+    handleRef: React.RefObject<HTMLDivElement>;
+    placement?: string;
+    offsetOuter: [number, number];
+}
+export declare const usePopoverOffset: ({ handleRef, placement, offsetOuter }: UsePopoverOffsetOptions) => [number, number];
+export {};
+//# sourceMappingURL=usePopoverOffset.d.ts.map

package/types/components/Popover/hooks/usePopoverOffset.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"usePopoverOffset.d.ts","sourceRoot":"","sources":["../../../../src/components/Popover/hooks/usePopoverOffset.ts"],"names":[],"mappings":";AAuBA,UAAU,uBAAuB;IAC7B,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC;AAED,eAAO,MAAM,gBAAgB,0CAA2C,uBAAuB,KAAG,CAAC,MAAM,EAAE,MAAM,CAkChH,CAAC"}