@salutejs/plasma-new-hope 0.326.0-canary.2016.15556762192.0 → 0.326.0-dev.0

package/styled-components/cjs/components/Carousel/CarouselNew/ui/Dots/utils/index.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getTargetIndex = exports.getInitialData = exports.getActiveIndex = void 0;
+var getInitialData = exports.getInitialData = function getInitialData(index, count, visibleCount) {
+  var newIndex = index;
+  var newVisibleCount = visibleCount;
+
+  // Ограничения на макс. и мин. значения индекса
+  if (index < 0) {
+    newIndex = 0;
+  } else if (index >= count) {
+    newIndex = count - 1;
+  }
+
+  // Ограничение на количество точек
+  if (visibleCount > count) {
+    newVisibleCount = count;
+  }
+  return [newIndex, newVisibleCount];
+};
+var getActiveIndex = exports.getActiveIndex = function getActiveIndex(index, isRightDirection, count, visibleCount) {
+  if (index < Math.trunc(visibleCount / 2)) {
+    return index;
+  }
+  if (count - 1 - index < Math.trunc(visibleCount / 2)) {
+    return visibleCount - 1 - (count - 1 - index);
+  }
+  if (visibleCount % 2) {
+    return Math.trunc(visibleCount / 2);
+  }
+  if (isRightDirection) {
+    return visibleCount / 2;
+  }
+  return visibleCount / 2 - 1;
+};
+var getTargetIndex = exports.getTargetIndex = function getTargetIndex(index, prevIndex, prevActiveIndex, diffDotsRange) {
+  if (index > prevIndex) {
+    return prevActiveIndex + diffDotsRange;
+  }
+  return prevActiveIndex - diffDotsRange;
+};

package/styled-components/cjs/components/Carousel/CarouselNew/ui/index.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _Dots = /*#__PURE__*/require("./Dots/Dots");
+Object.keys(_Dots).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _Dots[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _Dots[key];
+    }
+  });
+});

package/styled-components/cjs/components/Carousel/CarouselNew/variations/_size/base.js

@@ -0,0 +1,8 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.base = void 0;
+var _styledComponents = /*#__PURE__*/require("styled-components");
+var base = exports.base = /*#__PURE__*/(0, _styledComponents.css)([""]);

package/styled-components/cjs/components/Carousel/CarouselNew/variations/_size/tokens.json

@@ -0,0 +1 @@
+[]

package/styled-components/cjs/components/Carousel/CarouselNew/variations/_view/base.js

@@ -0,0 +1,8 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.base = void 0;
+var _styledComponents = /*#__PURE__*/require("styled-components");
+var base = exports.base = /*#__PURE__*/(0, _styledComponents.css)([""]);

package/styled-components/cjs/components/Carousel/CarouselNew/variations/_view/tokens.json

@@ -0,0 +1 @@
+[]

package/styled-components/cjs/components/Carousel/{Carousel.styles.js → CarouselOld/Carousel.styles.js}

@@ -16,16 +16,16 @@ var base = exports.base = /*#__PURE__*/(0, _styledComponents.css)([""]);
  * Стилизованный компонент, обладающий всеми свойствами ``div``.
  */
 var CarouselGridWrapper = exports.CarouselGridWrapper = /*#__PURE__*/_styledComponents["default"].div.withConfig({
-  componentId: "plasma-new-hope__sc-9g0yg0-0"
+  componentId: "plasma-new-hope__sc-15fotdl-0"
 })(["overflow:hidden;margin-left:calc(var(--plasma-grid-margin) * -1);margin-right:calc(var(--plasma-grid-margin) * -1);"]);
 var CarouselWrapper = exports.CarouselWrapper = /*#__PURE__*/_styledComponents["default"].div.withConfig({
-  componentId: "plasma-new-hope__sc-9g0yg0-1"
+  componentId: "plasma-new-hope__sc-15fotdl-1"
 })(["position:relative;margin:0;padding:0;list-style:none;-ms-overflow-style:none;scrollbar-width:none;::-webkit-scrollbar{display:none;}overflow-x:auto;overflow-y:hidden;scroll-behavior:smooth;scroll-snap-type:", ";", " &{scroll-padding:0 var(--plasma-grid-margin);padding-left:var(--plasma-grid-margin);}user-select:none;-webkit-tap-highlight-color:rgba(0,0,0,0);"], function (_ref) {
   var scrollSnapType = _ref.scrollSnapType;
   return "x ".concat(scrollSnapType);
 }, CarouselGridWrapper);
 var CarouselTrack = exports.CarouselTrack = /*#__PURE__*/_styledComponents["default"].div.withConfig({
-  componentId: "plasma-new-hope__sc-9g0yg0-2"
+  componentId: "plasma-new-hope__sc-15fotdl-2"
 })(["display:inline-flex;flex-direction:row;padding-left:", ";padding-right:", ";", " &{padding-right:", ";}"], function (_ref2) {
   var paddingStart = _ref2.paddingStart;
   return paddingStart || 0;

package/styled-components/cjs/components/Carousel/CarouselOld/Carousel.types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/styled-components/cjs/components/Carousel/{CarouselItem.js → CarouselOld/CarouselItem.js}

@@ -12,8 +12,8 @@ function _extends() { return _extends = Object.assign ? Object.assign.bind() : f
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 var StyledItem = /*#__PURE__*/_styledComponents["default"].div.withConfig({
-  componentId: "plasma-new-hope__sc-1h5d6du-0"
-})(["scroll-snap-align:", ";scroll-snap-stop:", ";"], function (_ref) {
+  componentId: "plasma-new-hope__sc-1b1k2uh-0"
+})(["scroll-snap-align:", ";scroll-snap-stop:", ";padding:0 var(--plasma_private-carousel-padding);"], function (_ref) {
   var scrollSnapAlign = _ref.scrollSnapAlign;
   return scrollSnapAlign || 'none';
 }, function (_ref2) {

package/styled-components/cjs/components/Carousel/CarouselOld/index.js

@@ -0,0 +1,32 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "CarouselGridWrapper", {
+  enumerable: true,
+  get: function get() {
+    return _Carousel2.CarouselGridWrapper;
+  }
+});
+Object.defineProperty(exports, "CarouselItem", {
+  enumerable: true,
+  get: function get() {
+    return _CarouselItem.CarouselItem;
+  }
+});
+Object.defineProperty(exports, "carouselConfig", {
+  enumerable: true,
+  get: function get() {
+    return _Carousel.carouselConfig;
+  }
+});
+Object.defineProperty(exports, "carouselRoot", {
+  enumerable: true,
+  get: function get() {
+    return _Carousel.carouselRoot;
+  }
+});
+var _Carousel = /*#__PURE__*/require("./Carousel");
+var _Carousel2 = /*#__PURE__*/require("./Carousel.styles");
+var _CarouselItem = /*#__PURE__*/require("./CarouselItem");

package/styled-components/cjs/components/Carousel/index.js

@@ -21,12 +21,32 @@ Object.defineProperty(exports, "carouselConfig", {
     return _Carousel.carouselConfig;
   }
 });
+Object.defineProperty(exports, "carouselNewConfig", {
+  enumerable: true,
+  get: function get() {
+    return _Carousel3.carouselNewConfig;
+  }
+});
+Object.defineProperty(exports, "carouselNewRoot", {
+  enumerable: true,
+  get: function get() {
+    return _Carousel3.carouselNewRoot;
+  }
+});
+Object.defineProperty(exports, "carouselNewTokens", {
+  enumerable: true,
+  get: function get() {
+    return _Carousel4.tokens;
+  }
+});
 Object.defineProperty(exports, "carouselRoot", {
   enumerable: true,
   get: function get() {
     return _Carousel.carouselRoot;
   }
 });
-var _Carousel = /*#__PURE__*/require("./Carousel");
-var _Carousel2 = /*#__PURE__*/require("./Carousel.styles");
-var _CarouselItem = /*#__PURE__*/require("./CarouselItem");
+var _Carousel = /*#__PURE__*/require("./CarouselOld/Carousel");
+var _Carousel2 = /*#__PURE__*/require("./CarouselOld/Carousel.styles");
+var _CarouselItem = /*#__PURE__*/require("./CarouselOld/CarouselItem");
+var _Carousel3 = /*#__PURE__*/require("./CarouselNew/Carousel");
+var _Carousel4 = /*#__PURE__*/require("./CarouselNew/Carousel.tokens");

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

@@ -21,11 +21,11 @@ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 var defaultFormatChars = [{
-  str: '*',
-  regexp: /./
-}, {
   str: '0',
   regexp: /[0-9]/
+}, {
+  str: '*',
+  regexp: /./
 }, {
   str: 'a',
   regexp: /[a-zA-Z]/

package/styled-components/cjs/examples/plasma_b2c/components/Carousel/Carousel.config.js

@@ -4,7 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.config = void 0;
+var _styledComponents = /*#__PURE__*/require("styled-components");
+var _Carousel = /*#__PURE__*/require("../../../../components/Carousel");
 var config = exports.config = {
-  defaults: {},
-  variations: {}
+  defaults: {
+    view: 'default',
+    size: 's'
+  },
+  variations: {
+    view: {
+      "default": /*#__PURE__*/(0, _styledComponents.css)(["", ":var(--surface-transparent-tertiary);", ":var(--surface-solid-default);"], _Carousel.carouselNewTokens.paginationDotBackground, _Carousel.carouselNewTokens.paginationDotActiveBackground)
+    },
+    size: {
+      s: /*#__PURE__*/(0, _styledComponents.css)([""])
+    }
+  }
 };

package/styled-components/cjs/examples/plasma_b2c/components/Carousel/Carousel.js

@@ -14,5 +14,5 @@ exports.mergedConfig = void 0;
 var _Carousel = /*#__PURE__*/require("../../../../components/Carousel");
 var _engines = /*#__PURE__*/require("../../../../engines");
 var _Carousel2 = /*#__PURE__*/require("./Carousel.config");
-var mergedConfig = exports.mergedConfig = /*#__PURE__*/(0, _engines.mergeConfig)(_Carousel.carouselConfig, _Carousel2.config);
+var mergedConfig = exports.mergedConfig = /*#__PURE__*/(0, _engines.mergeConfig)(_Carousel.carouselNewConfig, _Carousel2.config);
 var Carousel = exports.Carousel = /*#__PURE__*/(0, _engines.component)(mergedConfig);

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

@@ -2,76 +2,134 @@ import * as React from 'react';
 import type { ComponentProps } from 'react';
 import type { Meta, StoryObj } from '@storybook/react';
 import styled from 'styled-components';
+import { getConfigVariations } from '@salutejs/plasma-sb-utils';
 
 import { WithTheme } from '../../../_helpers';
 
+import { config } from './Carousel.config';
 import { Carousel, CarouselItem } from './Carousel';
 
-type StoryCarouselProps = ComponentProps<typeof Carousel>;
+type StoryCarouselProps = ComponentProps<typeof Carousel> & {
+    slides: number;
+    visibleDots: number;
+    paginationDisabled: boolean;
+    paginationCentered: boolean;
+};
+
+const { views, sizes } = getConfigVariations(config);
 
 const meta: Meta<StoryCarouselProps> = {
     title: 'b2c/Navigation/Carousel',
     component: Carousel,
     decorators: [WithTheme],
     argTypes: {
+        view: {
+            options: views,
+            control: {
+                type: 'select',
+            },
+        },
+        size: {
+            options: sizes,
+            control: {
+                type: 'inline-radio',
+            },
+        },
         align: {
-            options: ['center', 'start', 'end'],
+            options: ['start', 'center', 'end', 'activeDirection'],
             control: {
                 type: 'inline-radio',
             },
         },
-        isDragScrollDisabled: {
+        slides: {
+            control: 'number',
+        },
+        visibleDots: {
+            control: 'number',
+        },
+        controlArrowsDisabled: {
+            control: 'boolean',
+        },
+        paginationDisabled: {
+            control: 'boolean',
+        },
+        paginationCentered: {
             control: 'boolean',
         },
     },
     args: {
+        view: 'default',
+        size: 's',
         align: 'center',
-        isDragScrollDisabled: false,
+        slides: 10,
+        controlArrowsDisabled: false,
+        paginationDisabled: false,
+        paginationCentered: false,
     },
     parameters: {
         controls: {
-            include: ['align', 'isDragScrollDisabled'],
+            include: [
+                'align',
+                'visibleDots',
+                'slides',
+                'controlArrowsDisabled',
+                'paginationDisabled',
+                'paginationCentered',
+                'gap',
+            ],
         },
     },
 };
 
 export default meta;
 
-const items = Array(25)
-    .fill({
-        title: 'Заголовок',
-    })
-    .map(({ title }, i) => ({
-        id: i,
-        title: `${title} ${i}`,
-    }));
-
 const StyledCard = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: center;
     position: relative;
     border-radius: 8px;
-    width: 350px;
-    height: 50px;
-    padding: 8px;
+    width: 400px;
+    height: 370px;
     background-color: #add8e6;
+    font-size: 30px;
 `;
 
-const StoryDefault = ({ align, isDragScrollDisabled }: StoryCarouselProps) => {
-    const [index, setIndex] = React.useState(0);
+const StoryDefault = ({
+    align,
+    visibleDots,
+    slides,
+    paginationDisabled,
+    paginationCentered,
+    ...rest
+}: StoryCarouselProps) => {
+    const items = Array(slides)
+        .fill(1)
+        .map((_, i) => ({
+            id: i,
+            title: i,
+        }));
 
     return (
-        <Carousel
-            index={index}
-            detectActive
-            onIndexChange={setIndex}
-            scrollAlign={align}
-            isDragScrollDisabled={isDragScrollDisabled}
-        >
-            {items.map((item, i) => (
-                <CarouselItem key={i} style={{ padding: '0 0.5rem' }} scrollSnapAlign={align}>
-                    <StyledCard>{item.title}</StyledCard>
-                </CarouselItem>
-            ))}
-        </Carousel>
+        <>
+            <div style={{ width: '600px' }}>
+                <Carousel
+                    scrollAlign={align}
+                    paginationOptions={{
+                        disabled: paginationDisabled,
+                        visibleDots,
+                        centered: paginationCentered,
+                    }}
+                    {...rest}
+                >
+                    {items.map((item, i) => (
+                        <CarouselItem key={i}>
+                            <StyledCard>{item.title}</StyledCard>
+                        </CarouselItem>
+                    ))}
+                </Carousel>
+            </div>
+        </>
     );
 };
 

package/styled-components/cjs/examples/plasma_web/components/Carousel/Carousel.config.js

@@ -4,7 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.config = void 0;
+var _styledComponents = /*#__PURE__*/require("styled-components");
+var _Carousel = /*#__PURE__*/require("../../../../components/Carousel");
 var config = exports.config = {
-  defaults: {},
-  variations: {}
+  defaults: {
+    view: 'default',
+    size: 's'
+  },
+  variations: {
+    view: {
+      "default": /*#__PURE__*/(0, _styledComponents.css)(["", ":var(--surface-transparent-tertiary);", ":var(--surface-solid-default);"], _Carousel.carouselNewTokens.paginationDotBackground, _Carousel.carouselNewTokens.paginationDotActiveBackground)
+    },
+    size: {
+      s: /*#__PURE__*/(0, _styledComponents.css)([""])
+    }
+  }
 };

package/styled-components/cjs/examples/plasma_web/components/Carousel/Carousel.js

@@ -14,5 +14,5 @@ exports.mergedConfig = void 0;
 var _Carousel = /*#__PURE__*/require("../../../../components/Carousel");
 var _engines = /*#__PURE__*/require("../../../../engines");
 var _Carousel2 = /*#__PURE__*/require("./Carousel.config");
-var mergedConfig = exports.mergedConfig = /*#__PURE__*/(0, _engines.mergeConfig)(_Carousel.carouselConfig, _Carousel2.config);
+var mergedConfig = exports.mergedConfig = /*#__PURE__*/(0, _engines.mergeConfig)(_Carousel.carouselNewConfig, _Carousel2.config);
 var Carousel = exports.Carousel = /*#__PURE__*/(0, _engines.component)(mergedConfig);

package/styled-components/cjs/examples/plasma_web/components/Carousel/Carousel.stories.tsx

@@ -2,76 +2,135 @@ import * as React from 'react';
 import type { ComponentProps } from 'react';
 import type { Meta, StoryObj } from '@storybook/react';
 import styled from 'styled-components';
+import { getConfigVariations } from '@salutejs/plasma-sb-utils';
 
 import { WithTheme } from '../../../_helpers';
 
+import { config } from './Carousel.config';
 import { Carousel, CarouselItem } from './Carousel';
 
-type StoryCarouselProps = ComponentProps<typeof Carousel>;
+type StoryCarouselProps = ComponentProps<typeof Carousel> & {
+    slides: number;
+    visibleDots: number;
+    paginationDisabled: boolean;
+    paginationCentered: boolean;
+};
+
+const { views, sizes } = getConfigVariations(config);
 
 const meta: Meta<StoryCarouselProps> = {
     title: 'web/Navigation/Carousel',
     component: Carousel,
     decorators: [WithTheme],
     argTypes: {
+        view: {
+            options: views,
+            control: {
+                type: 'select',
+            },
+        },
+        size: {
+            options: sizes,
+            control: {
+                type: 'inline-radio',
+            },
+        },
         align: {
-            options: ['center', 'start', 'end'],
+            options: ['start', 'center', 'end', 'activeDirection'],
             control: {
                 type: 'inline-radio',
             },
         },
-        isDragScrollDisabled: {
+        slides: {
+            control: 'number',
+        },
+        visibleDots: {
+            control: 'number',
+        },
+        controlArrowsDisabled: {
+            control: 'boolean',
+        },
+        paginationDisabled: {
+            control: 'boolean',
+        },
+        paginationCentered: {
             control: 'boolean',
         },
     },
     args: {
+        view: 'default',
+        size: 's',
         align: 'center',
-        isDragScrollDisabled: false,
+        visibleDots: 6,
+        slides: 10,
+        controlArrowsDisabled: false,
+        paginationDisabled: false,
+        paginationCentered: false,
     },
     parameters: {
         controls: {
-            include: ['align', 'isDragScrollDisabled'],
+            include: [
+                'align',
+                'visibleDots',
+                'slides',
+                'controlArrowsDisabled',
+                'paginationDisabled',
+                'paginationCentered',
+                'gap',
+            ],
         },
     },
 };
 
 export default meta;
 
-const items = Array(25)
-    .fill({
-        title: 'Заголовок',
-    })
-    .map(({ title }, i) => ({
-        id: i,
-        title: `${title} ${i}`,
-    }));
-
 const StyledCard = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: center;
     position: relative;
     border-radius: 8px;
-    width: 350px;
-    height: 50px;
-    padding: 8px;
+    width: 400px;
+    height: 370px;
     background-color: #add8e6;
+    font-size: 30px;
 `;
 
-const StoryDefault = ({ align, isDragScrollDisabled }: StoryCarouselProps) => {
-    const [index, setIndex] = React.useState(0);
+const StoryDefault = ({
+    align,
+    visibleDots,
+    slides,
+    paginationDisabled,
+    paginationCentered,
+    ...rest
+}: StoryCarouselProps) => {
+    const items = Array(slides)
+        .fill(1)
+        .map((_, i) => ({
+            id: i,
+            title: i,
+        }));
 
     return (
-        <Carousel
-            index={index}
-            detectActive
-            onIndexChange={setIndex}
-            scrollAlign={align}
-            isDragScrollDisabled={isDragScrollDisabled}
-        >
-            {items.map((item, i) => (
-                <CarouselItem key={i} style={{ padding: '0 0.5rem' }} scrollSnapAlign={align}>
-                    <StyledCard>{item.title}</StyledCard>
-                </CarouselItem>
-            ))}
-        </Carousel>
+        <>
+            <div style={{ width: '600px' }}>
+                <Carousel
+                    scrollAlign={align}
+                    paginationOptions={{
+                        disabled: paginationDisabled,
+                        visibleDots,
+                        centered: paginationCentered,
+                    }}
+                    {...rest}
+                >
+                    {items.map((item, i) => (
+                        <CarouselItem key={i}>
+                            <StyledCard>{item.title}</StyledCard>
+                        </CarouselItem>
+                    ))}
+                </Carousel>
+            </div>
+        </>
     );
 };
 

package/styled-components/cjs/hooks/index.js

@@ -9,6 +9,12 @@ Object.defineProperty(exports, "useDidMountEffect", {
     return _useDidMountEffect.useDidMountEffect;
   }
 });
+Object.defineProperty(exports, "useDidMountLayoutEffect", {
+  enumerable: true,
+  get: function get() {
+    return _useDidMountLayoutEffect.useDidMountLayoutEffect;
+  }
+});
 Object.defineProperty(exports, "useFocusTrap", {
   enumerable: true,
   get: function get() {
@@ -50,5 +56,6 @@ var _useFocusTrap = /*#__PURE__*/require("./useFocusTrap");
 var _usePreviousValue = /*#__PURE__*/require("./usePreviousValue");
 var _useForceUpdate = /*#__PURE__*/require("./useForceUpdate");
 var _useDidMountEffect = /*#__PURE__*/require("./useDidMountEffect");
+var _useDidMountLayoutEffect = /*#__PURE__*/require("./useDidMountLayoutEffect");
 var _useOutsideClick = /*#__PURE__*/require("./useOutsideClick");
 var _useIsomorphicLayoutEffect = /*#__PURE__*/require("./useIsomorphicLayoutEffect");

package/styled-components/cjs/hooks/useDidMountLayoutEffect.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useDidMountLayoutEffect = void 0;
+var _react = /*#__PURE__*/require("react");
+var useDidMountLayoutEffect = exports.useDidMountLayoutEffect = function useDidMountLayoutEffect(fn, inputs) {
+  var didMountRef = (0, _react.useRef)(false);
+  (0, _react.useLayoutEffect)(function () {
+    if (didMountRef.current) {
+      fn();
+    } else {
+      didMountRef.current = true;
+    }
+  }, inputs);
+};