@salutejs/plasma-new-hope 0.174.0-canary.1452.11462555994.0 → 0.174.0-canary.1488.11483339131.0

package/emotion/cjs/examples/plasma_web/components/Slider/Slider.stories.tsx

@@ -4,18 +4,14 @@ import styled from 'styled-components';
 import { disableProps } from '@salutejs/plasma-sb-utils';
 import type { StoryObj, Meta } from '@storybook/react';
 
-import { IconMic } from '../../../../components/_Icon';
 import { WithTheme } from '../../../_helpers';
 
 import { Slider } from './Slider';
 
 const sizes = ['l', 'm', 's'];
-const pointerSizes = ['small', 'large', 'none'];
 const views = ['default', 'accent', 'gradient'];
-const sliderAligns = ['center', 'left', 'right', 'none'];
-const labelPlacements = ['top', 'left'];
-const scaleAligns = ['side', 'bottom'];
-const orientations: Array<string> = ['vertical', 'horizontal'];
+const labelPlacements = ['outer', 'inner'];
+const rangeValuesPlacement = ['outer', 'inner'];
 
 const meta: Meta<typeof Slider> = {
     title: 'plasma_web/Slider',
@@ -34,24 +30,9 @@ const meta: Meta<typeof Slider> = {
                 type: 'inline-radio',
             },
         },
-        pointerSize: {
-            options: pointerSizes,
-            control: {
-                type: 'inline-radio',
-            },
-        },
-        orientation: {
-            options: orientations,
-            control: {
-                type: 'select',
-            },
-        },
         ...disableProps([
             'value',
             'onChangeCommitted',
-            'onChangeTextField',
-            'onBlurTextField',
-            'onKeyDownTextField',
             'ariaLabel',
             'onChange',
             'fontSizeMultiplier',
@@ -71,9 +52,8 @@ type StorySingleProps = StoryProps;
 type StorySingle = StoryObj<StorySingleProps>;
 type StoryDouble = StoryObj<StoryProps>;
 
-const SliderWrapper = styled.div<{ isVertical?: boolean }>`
-    width: ${({ isVertical }) => (isVertical ? 'auto' : '25rem')};
-    height: ${({ isVertical }) => (isVertical ? '25rem' : 'auto')};
+const SliderWrapper = styled.div`
+    width: 25rem;
 `;
 
 const StoryDefault = (args: StorySingleProps) => {
@@ -87,86 +67,41 @@ const StoryDefault = (args: StorySingleProps) => {
         setValue(values);
     };
 
-    const { hasIcon, showIcon, orientation, labelPlacement, labelVerticalPlacement, ...rest } = args;
-    const isVertical = orientation === 'vertical';
-
     return (
-        <SliderWrapper isVertical={isVertical}>
-            <Slider
-                value={value}
-                orientation={orientation}
-                labelPlacement={labelPlacement}
-                labelContent={showIcon ? <IconMic size={rest.size === 's' ? 'xs' : 's'} /> : null}
-                onChangeCommitted={onChangeCommittedHandle}
-                onChange={onChangeHandle}
-                {...rest}
-            />
+        <SliderWrapper>
+            <Slider value={value} onChangeCommitted={onChangeCommittedHandle} onChange={onChangeHandle} {...args} />
         </SliderWrapper>
     );
 };
 
 export const Default: StorySingle = {
     argTypes: {
-        sliderAlign: {
-            options: sliderAligns,
-            control: {
-                type: 'inline-radio',
-            },
-            if: { arg: 'orientation', eq: 'vertical' },
-        },
         labelPlacement: {
             options: labelPlacements,
             control: {
                 type: 'inline-radio',
             },
-            if: { arg: 'orientation', eq: 'horizontal' },
-        },
-        labelReversed: {
-            control: {
-                type: 'boolean',
-                expanded: true,
-            },
-            if: { arg: 'orientation', eq: 'vertical' },
-        },
-        scaleAlign: {
-            options: scaleAligns,
-            control: {
-                type: 'inline-radio',
-            },
-            if: { arg: 'orientation', eq: 'horizontal' },
         },
-        orientation: {
-            options: orientations,
+        rangeValuesPlacement: {
+            options: rangeValuesPlacement,
             control: {
                 type: 'inline-radio',
             },
         },
-        reversed: {
-            control: {
-                type: 'boolean',
-            },
-            if: { arg: 'orientation', eq: 'vertical' },
-        },
     },
     args: {
         view: 'default',
         size: 'm',
-        pointerSize: 'small',
         min: 0,
         max: 100,
-        orientation: 'horizontal',
-        ariaLabel: 'Цена микрофона',
+        disabled: false,
+        ariaLabel: 'Цена товара',
         multipleStepSize: 10,
-        label: 'Цена микрофона',
-        labelPlacement: 'top',
-        sliderAlign: 'center',
-        scaleAlign: 'bottom',
-        showScale: true,
+        label: 'Цена товара',
+        labelPlacement: 'outer',
+        rangeValuesPlacement: 'outer',
+        showRangeValues: true,
         showCurrentValue: false,
-        showIcon: true,
-        reversed: false,
-        labelReversed: false,
-        disabled: false,
     },
     render: (args) => <StoryDefault {...args} />,
 };
@@ -206,7 +141,7 @@ const StoryMultipleValues = (args: StoryProps) => {
     };
 
     return (
-        <SliderWrapper isVertical={args.orientation === 'vertical'}>
+        <SliderWrapper>
             <Slider
                 value={value}
                 onKeyDownTextField={onKeyDownTextField}
@@ -223,7 +158,6 @@ export const MultipleValues: StoryDouble = {
     args: {
         view: 'default',
         size: 'm',
-        pointerSize: 'small',
         min: 0,
         max: 100,
         disabled: false,
@@ -231,14 +165,5 @@ export const MultipleValues: StoryDouble = {
         ariaLabel: ['Минимальная цена товара', 'Максимальная цена товара'],
         multipleStepSize: 10,
     },
-    argTypes: {
-        pointerSize: {
-            options: ['small', 'large'],
-            control: {
-                type: 'inline-radio',
-            },
-        },
-        ...disableProps(['orientation']),
-    },
     render: (args) => <StoryMultipleValues {...args} />,
 };

package/emotion/cjs/examples/plasma_web/components/ViewContainer/ViewContainer.config.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.config = void 0;
+var _react = /*#__PURE__*/require("@emotion/react");
+var _plasma_b2c = /*#__PURE__*/require("@salutejs/plasma-themes/tokens/plasma_b2c");
+var config = exports.config = {
+  variations: {
+    view: {
+      onDark: /*#__PURE__*/(0, _react.css)(_plasma_b2c.viewContainer.dark, ";;label:plasma-new-hope__onDark;" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy1lbW90aW9uL2V4YW1wbGVzL3BsYXNtYV93ZWIvY29tcG9uZW50cy9WaWV3Q29udGFpbmVyL1ZpZXdDb250YWluZXIuY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU11QiIsImZpbGUiOiIuLi8uLi8uLi8uLi8uLi8uLi9zcmMtZW1vdGlvbi9leGFtcGxlcy9wbGFzbWFfd2ViL2NvbXBvbmVudHMvVmlld0NvbnRhaW5lci9WaWV3Q29udGFpbmVyLmNvbmZpZy50cyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGNzcyB9IGZyb20gJ0BlbW90aW9uL3JlYWN0JztcbmltcG9ydCB7IHZpZXdDb250YWluZXIgfSBmcm9tICdAc2FsdXRlanMvcGxhc21hLXRoZW1lcy90b2tlbnMvcGxhc21hX2IyYyc7XG5cbmV4cG9ydCBjb25zdCBjb25maWcgPSB7XG4gICAgdmFyaWF0aW9uczoge1xuICAgICAgICB2aWV3OiB7XG4gICAgICAgICAgICBvbkRhcms6IGNzc2BcbiAgICAgICAgICAgICAgICAke3ZpZXdDb250YWluZXIuZGFya31cbiAgICAgICAgICAgIGAsXG4gICAgICAgICAgICBvbkxpZ2h0OiBjc3NgXG4gICAgICAgICAgICAgICAgJHt2aWV3Q29udGFpbmVyLmxpZ2h0fVxuICAgICAgICAgICAgYCxcbiAgICAgICAgfSxcbiAgICB9LFxufTtcbiJdfQ== */")),
+      onLight: /*#__PURE__*/(0, _react.css)(_plasma_b2c.viewContainer.light, ";;label:plasma-new-hope__onLight;" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy1lbW90aW9uL2V4YW1wbGVzL3BsYXNtYV93ZWIvY29tcG9uZW50cy9WaWV3Q29udGFpbmVyL1ZpZXdDb250YWluZXIuY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVN3QiIsImZpbGUiOiIuLi8uLi8uLi8uLi8uLi8uLi9zcmMtZW1vdGlvbi9leGFtcGxlcy9wbGFzbWFfd2ViL2NvbXBvbmVudHMvVmlld0NvbnRhaW5lci9WaWV3Q29udGFpbmVyLmNvbmZpZy50cyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGNzcyB9IGZyb20gJ0BlbW90aW9uL3JlYWN0JztcbmltcG9ydCB7IHZpZXdDb250YWluZXIgfSBmcm9tICdAc2FsdXRlanMvcGxhc21hLXRoZW1lcy90b2tlbnMvcGxhc21hX2IyYyc7XG5cbmV4cG9ydCBjb25zdCBjb25maWcgPSB7XG4gICAgdmFyaWF0aW9uczoge1xuICAgICAgICB2aWV3OiB7XG4gICAgICAgICAgICBvbkRhcms6IGNzc2BcbiAgICAgICAgICAgICAgICAke3ZpZXdDb250YWluZXIuZGFya31cbiAgICAgICAgICAgIGAsXG4gICAgICAgICAgICBvbkxpZ2h0OiBjc3NgXG4gICAgICAgICAgICAgICAgJHt2aWV3Q29udGFpbmVyLmxpZ2h0fVxuICAgICAgICAgICAgYCxcbiAgICAgICAgfSxcbiAgICB9LFxufTtcbiJdfQ== */"))
+    }
+  }
+};

package/emotion/cjs/examples/plasma_web/components/ViewContainer/ViewContainer.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ViewContainer = void 0;
+var _ViewContainer = /*#__PURE__*/require("../../../../components/ViewContainer");
+var _engines = /*#__PURE__*/require("../../../../engines");
+var _ViewContainer2 = /*#__PURE__*/require("./ViewContainer.config");
+var mergedConfig = /*#__PURE__*/(0, _engines.mergeConfig)(_ViewContainer.viewContainerConfig, _ViewContainer2.config);
+var ViewContainer = exports.ViewContainer = /*#__PURE__*/(0, _engines.component)(mergedConfig);

package/emotion/cjs/examples/plasma_web/components/ViewContainer/ViewContainer.stories.tsx

@@ -0,0 +1,65 @@
+import React, { ComponentProps } from 'react';
+import type { StoryObj, Meta } from '@storybook/react';
+
+import { Button } from '../Button/Button';
+import { TextField } from '../TextField/TextField';
+import { Checkbox } from '../Checkbox/Checkbox';
+
+import { ViewContainer } from './ViewContainer';
+
+type StoryViewProps = ComponentProps<typeof ViewContainer>;
+
+const meta: Meta<StoryViewProps> = {
+    title: 'plasma_web/ViewContainer',
+};
+
+export default meta;
+
+type Story = StoryObj<StoryViewProps>;
+
+const ViewExample = ({ view }: StoryViewProps) => {
+    const style = view
+        ? {
+              background: view === 'onDark' ? '#1a1a1a' : '#ededed',
+              color: view === 'onDark' ? 'white' : 'black',
+          }
+        : undefined;
+
+    return (
+        <>
+            <h4>view: {view ?? 'default'}</h4>
+            <div>
+                <ViewContainer
+                    view={view}
+                    style={{
+                        ...style,
+                        padding: '1rem',
+                        borderRadius: '1rem',
+                        display: 'flex',
+                        flexDirection: 'column',
+                        gap: '1rem',
+                    }}
+                >
+                    <h3 style={{ margin: 0 }}>Inside ViewContainer</h3>
+                    <Button text="default Button" />
+                    <Checkbox checked label="Label" />
+                    <TextField value="Example Value" label="Label" labelPlacement="inner" />
+                </ViewContainer>
+            </div>
+        </>
+    );
+};
+
+export const Default: Story = {
+    render: () => {
+        return (
+            <>
+                <ViewExample />
+                <br />
+                <ViewExample view="onDark" />
+                <br />
+                <ViewExample view="onLight" />
+            </>
+        );
+    },
+};

package/emotion/cjs/index.js

@@ -673,4 +673,15 @@ Object.keys(_Attach).forEach(function (key) {
       return _Attach[key];
     }
   });
+});
+var _ViewContainer = /*#__PURE__*/require("./components/ViewContainer");
+Object.keys(_ViewContainer).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _ViewContainer[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _ViewContainer[key];
+    }
+  });
 });

package/emotion/es/components/Slider/Slider.js

@@ -4,13 +4,10 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 import React, { forwardRef } from 'react';
-import { cx } from '../../utils';
 import { base as viewCSS } from './variations/_view/base';
 import { base as sizeCSS } from './variations/_size/base';
 import { base as disabledCSS } from './variations/_disabled/base';
 import { SingleSlider, DoubleUncontrolled } from './components';
-import { classes } from './Slider.tokens';
-
 // TODO: проверить, можно ли обойтись без каста типов
 
 var isSingleValueProps = function isSingleValueProps(props, type) {
@@ -24,15 +21,9 @@ export var sliderRoot = function sliderRoot(Root) {
     var _ref$type = _ref.type,
       type = _ref$type === void 0 ? 'single' : _ref$type,
       props = _objectWithoutProperties(_ref, _excluded);
-    if (isSingleValueProps(props, type)) {
-      return /*#__PURE__*/React.createElement(Root, _extends({}, props, {
-        className: cx(props.orientation === 'vertical' && classes.verticalOrientation, props.className),
-        ref: ref
-      }), /*#__PURE__*/React.createElement(SingleSlider, props));
-    }
-    return /*#__PURE__*/React.createElement(Root, _extends({
+    return /*#__PURE__*/React.createElement(Root, _extends({}, props, {
       ref: ref
-    }, props), isDoubleValueProps(props, type) && /*#__PURE__*/React.createElement(DoubleUncontrolled, props));
+    }), isSingleValueProps(props, type) && /*#__PURE__*/React.createElement(SingleSlider, props), isDoubleValueProps(props, type) && /*#__PURE__*/React.createElement(DoubleUncontrolled, props));
   });
 };
 export var sliderConfig = {

package/emotion/es/components/Slider/Slider.template-doc.mdx

@@ -76,29 +76,3 @@ export function App() {
     );
 }
 ```
-
-# Вертикальное отображение
-
-```tsx live
-import React from 'react';
-import { Slider  } from '@salutejs/{{ package }}';
-import { IconMic } from '@salutejs/plasma-icons';
-
-export function App() {
-    return (
-        <section>
-            <Slider
-                onChangeCommitted={() => {}}
-                min={0}
-                max={100}
-                value={30}
-                label="Громкость"
-                labelContent={<IconMic size="s" />}
-                orientation="vertical"
-                sliderAlign="center"
-                size="m"
-            />
-        </section>
-    );
-}
-```

package/emotion/es/components/Slider/Slider.tokens.js

@@ -1,12 +1,6 @@
 export var classes = {
   labelPlacementOuter: 'slider-label-placement-outer',
   labelPlacementInner: 'slider-label-placement-inner',
-  labelPlacementBottom: 'slider-label-placement-bottom',
-  labelAlignLeft: 'slider-label-align-left',
-  labelAlignCenter: 'slider-label-align-center',
-  labelAlignRight: 'slider-label-align-right',
-  labelAlignNone: 'slider-label-align-none',
-  labelContentReversed: 'slider-label-content-reversed',
   rangeValuesPlacementOuter: 'slider-range-values-placement-outer',
   rangeValuesPlacementInner: 'slider-range-values-placement-inner',
   maxRangeValue: 'slider-max-range-value',
@@ -15,17 +9,13 @@ export var classes = {
   textFieldActive: 'slider-text-field-active',
   firstTextField: 'slider-first-text-field',
   secondTextField: 'slider-second-text-field',
-  activeRangeValue: 'slider-active-range-value',
-  verticalOrientation: 'slider-vertical-orientation',
-  valuePlacementLeft: 'slider-value-placement-left',
-  reversed: 'slider-reversed'
+  activeRangeValue: 'slider-active-range-value'
 };
 export var tokens = {
-  size: '--plasma-slider-size',
+  height: '--plasma-slider-height',
   labelWrapperGap: '--plasma-slider-label-wrapper-gap',
   labelWrapperMarginBottom: '--plasma-slider-label-wrapper-margin-bottom',
   labelWrapperMarginRight: '--plasma-slider-label-wrapper-margin-right',
-  labelWrapperVerticalMargin: '--plasma-slider-label-wrapper-vertical-margin',
   labelColor: '--plasma-slider-label-color',
   labelFontFamily: '--plasma-slider-label-font-family',
   labelFontSize: '--plasma-slider-label-font-size',
@@ -33,27 +23,31 @@ export var tokens = {
   labelFontWeight: '--plasma-slider-label-font-weight',
   labelLetterSpacing: '--plasma-slider-label-letter-spacing',
   labelLineHeight: '--plasma-slider-label-line-height',
+  rangeMinValueMargin: '--plasma-slider-range-min-value-margin',
+  rangeMaxValueMargin: '--plasma-slider-range-max-value-margin',
   rangeValueBottomOffset: '--plasma-slider-range-value-bottom-offset',
-  rangeValueHorizontalMargin: '--plasma-slider-range-value-horizontal-margin',
-  rangeValueHorizontalOffset: '--plasma-slider-range-value-horizontal-offset',
-  rangeValueVerticalMargin: '--plasma-slider-range-value-vertical-margin',
   rangeValueColor: '--plasma-slider-range-value-color',
-  valueFontFamily: '--plasma-slider-value-font-family',
-  valueFontSize: '--plasma-slider-value-font-size',
-  valueFontStyle: '--plasma-slider-value-font-style',
-  valueFontWeight: '--plasma-slider-value-font-weight',
-  valueLetterSpacing: '--plasma-slider-value-letter-spacing',
-  valueLineHeight: '--plasma-slider-value-line-height',
+  rangeValueFontFamily: '--plasma-slider-range-value-font-family',
+  rangeValueFontSize: '--plasma-slider-range-value-font-size',
+  rangeValueFontStyle: '--plasma-slider-range-value-font-style',
+  rangeValueFontWeight: '--plasma-slider-range-value-font-weight',
+  rangeValueLetterSpacing: '--plasma-slider-range-value-letter-spacing',
+  rangeValueLineHeight: '--plasma-slider-range-value-line-height',
   doubleWrapperGap: '--plasma-slider-double-wrapper-gap',
   thumbSize: '--plasma-slider-thumb-size',
-  thumbSizeLarge: '--plasma-slider-thumb-size-large',
   thumbBorder: '--plasma-slider-thumb-border',
   thumbBorderColor: '--plasma-slider-thumb-border-color',
   thumbBackgroundColor: '--plasma-slider-thumb-background-color',
   thumbFocusBorderColor: '--plasma-slider-thumb-focus-border-color',
   currentValueTopOffset: '--plasma-slider-current-value-top-offset',
+  currentValueFontFamily: '--plasma-slider-current-value-font-family',
+  currentValueFontSize: '--plasma-slider-current-value-font-size',
+  currentValueFontStyle: '--plasma-slider-current-value-font-style',
+  currentValueFontWeight: '--plasma-slider-current-value-font-weight',
+  currentValueLetterSpacing: '--plasma-slider-current-value-letter-spacing',
+  currentValueLineHeight: '--plasma-slider-current-value-line-height',
   railBackgroundColor: '--plasma-slider-rail-background-color',
-  railThickness: '--plasma-slider-rail-thickness',
+  railHeight: '--plasma-slider-rail-height',
   railBorderRadius: '--plasma-slider-rail-border-radius',
   railIndent: '--plasma-slider-rail-indent',
   fillColor: '--plasma-slider-fill-color',

package/emotion/es/components/Slider/components/Double/Double.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["min", "max", "value", "disabled", "label", "labelContentLeft", "size", "pointerSize", "onChangeCommitted", "onChangeTextField", "onBlurTextField", "onKeyDownTextField", "onChange", "ariaLabel", "multipleStepSize", "name"];
+var _excluded = ["min", "max", "value", "disabled", "label", "labelContentLeft", "size", "onChangeCommitted", "onChangeTextField", "onBlurTextField", "onKeyDownTextField", "onChange", "ariaLabel", "multipleStepSize", "name"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -38,8 +38,6 @@ export var DoubleSlider = function DoubleSlider(_ref) {
     labelContentLeft = _ref.labelContentLeft,
     _ref$size = _ref.size,
     size = _ref$size === void 0 ? 'm' : _ref$size,
-    _ref$pointerSize = _ref.pointerSize,
-    pointerSize = _ref$pointerSize === void 0 ? 'small' : _ref$pointerSize,
     onChangeCommitted = _ref.onChangeCommitted,
     onChangeTextField = _ref.onChangeTextField,
     onBlurTextField = _ref.onBlurTextField,
@@ -66,30 +64,20 @@ export var DoubleSlider = function DoubleSlider(_ref) {
     setState = _useState2[1];
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    firstInputHovered = _useState4[0],
-    setFirstInputHovered = _useState4[1];
+    firstInputActive = _useState4[0],
+    setFirstInputActive = _useState4[1];
   var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    firstInputFocused = _useState6[0],
-    setFirstInputFocused = _useState6[1];
-  var _useState7 = useState(false),
+    secondInputActive = _useState6[0],
+    setSecondInputActive = _useState6[1];
+  var _useState7 = useState(value[0]),
     _useState8 = _slicedToArray(_useState7, 2),
-    secondInputHovered = _useState8[0],
-    setSecondInputHovered = _useState8[1];
-  var _useState9 = useState(false),
+    firstValue = _useState8[0],
+    setFirstValue = _useState8[1];
+  var _useState9 = useState(value[1]),
     _useState10 = _slicedToArray(_useState9, 2),
-    secondInputFocused = _useState10[0],
-    setSecondInputFocused = _useState10[1];
-  var firstInputActive = firstInputHovered || firstInputFocused;
-  var secondInputActive = secondInputHovered || secondInputFocused;
-  var _useState11 = useState(value[0]),
-    _useState12 = _slicedToArray(_useState11, 2),
-    firstValue = _useState12[0],
-    setFirstValue = _useState12[1];
-  var _useState13 = useState(value[1]),
-    _useState14 = _slicedToArray(_useState13, 2),
-    secondValue = _useState14[0],
-    setSecondValue = _useState14[1];
+    secondValue = _useState10[0],
+    setSecondValue = _useState10[1];
   var firstHandleRef = useRef(null);
   var secondHandleRef = useRef(null);
   var firstHandleValue = useRef(value[0]);
@@ -114,16 +102,6 @@ export var DoubleSlider = function DoubleSlider(_ref) {
       });
     });
   }, [value, stepSize, min, max, setFirstValue, setSecondValue]);
-  useEffect(function () {
-    var onMouseUp = function onMouseUp() {
-      setFirstInputFocused(false);
-      setSecondInputFocused(false);
-    };
-    window.addEventListener('mouseup', onMouseUp);
-    return function () {
-      window.removeEventListener('mouseup', onMouseUp);
-    };
-  }, []);
   var setStepSize = useCallback(function (newStepSize) {
     setState(function (prevState) {
       return _objectSpread(_objectSpread({}, prevState), {}, {
@@ -265,20 +243,16 @@ export var DoubleSlider = function DoubleSlider(_ref) {
     ariaLabelLeft = _ref3[0],
     ariaLabelRight = _ref3[1];
   var currentFirstSliderValue = Math.max(state.firstValue, min);
-  var settings = sizeData[size][pointerSize === 'large' ? 'large' : 'small'];
   return /*#__PURE__*/React.createElement(DoubleWrapper, null, hasLabelContent && /*#__PURE__*/React.createElement(LabelWrapper, null, labelContentLeft && /*#__PURE__*/React.createElement(LabelContentLeft, null, labelContentLeft), label && /*#__PURE__*/React.createElement(Label, null, label)), /*#__PURE__*/React.createElement(SliderWrapper, null, /*#__PURE__*/React.createElement(SliderBase, _extends({
     min: min,
     max: max,
-    size: size,
     disabled: disabled,
     setStepSize: setStepSize,
     railFillWidth: state.railFillWidth,
-    settings: settings,
-    railFillXPosition: state.railFillXPosition,
-    orientation: "horizontal"
+    settings: sizeData[size],
+    railFillXPosition: state.railFillXPosition
   }, rest), /*#__PURE__*/React.createElement(Handler, {
     ref: firstHandleRef,
-    size: pointerSize,
     stepSize: state.stepSize,
     multipleStepSize: multipleStepSize,
     onChangeCommitted: onFirstHandleChangeCommitted,
@@ -288,23 +262,18 @@ export var DoubleSlider = function DoubleSlider(_ref) {
     disabled: disabled,
     bounds: [min, state.secondValue],
     side: "left",
-    orientation: "horizontal",
-    position: state.xFirstHandle,
+    xPosition: state.xFirstHandle,
     zIndex: state.firstHandleZIndex,
     value: currentFirstSliderValue,
     ariaLabel: ariaLabelLeft,
-    onMouseDown: function onMouseDown() {
-      return setFirstInputFocused(true);
-    },
     onMouseEnter: function onMouseEnter() {
-      return setFirstInputHovered(true);
+      return setFirstInputActive(true);
     },
     onMouseLeave: function onMouseLeave() {
-      return setFirstInputHovered(false);
+      return setFirstInputActive(false);
     }
   }), /*#__PURE__*/React.createElement(Handler, {
     ref: secondHandleRef,
-    size: pointerSize,
     stepSize: state.stepSize,
     multipleStepSize: multipleStepSize,
     onChangeCommitted: onSecondHandleChangeCommitted,
@@ -315,19 +284,15 @@ export var DoubleSlider = function DoubleSlider(_ref) {
     disabled: disabled,
     bounds: [state.firstValue, max],
     side: "right",
-    orientation: "horizontal",
-    position: state.xSecondHandle,
+    xPosition: state.xSecondHandle,
     zIndex: state.secondHandleZIndex,
     value: Math.max(state.secondValue, min),
     ariaLabel: ariaLabelRight,
-    onMouseDown: function onMouseDown() {
-      return setSecondInputFocused(true);
-    },
     onMouseEnter: function onMouseEnter() {
-      return setSecondInputHovered(true);
+      return setSecondInputActive(true);
     },
     onMouseLeave: function onMouseLeave() {
-      return setSecondInputHovered(false);
+      return setSecondInputActive(false);
     }
   })), /*#__PURE__*/React.createElement(InputsWrapper, null, /*#__PURE__*/React.createElement(StyledInput, {
     className: cx(classes.firstTextField, firstInputActiveClass),