@invoicebox/ui 0.1.0-alpha.304 → 0.1.0-alpha.305

package/dist/components/form/Select/components/Input/index.js

@@ -11,14 +11,14 @@ var _InputLabel = require("../../../InputLabel");
 var _PureInput = require("../../../PureInput");
 var _Arrow = require("../../../../common/Arrow");
 var _ResetButton = require("../../../ResetButton");
-var _constants = require("../../../constants");
-var _ModernPlaceholder = require("../../../ModernPlaceholder");
+var _useInputStyles2 = require("../../../_hooks/useInputStyles");
 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; }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 var Input = exports.Input = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var hasError = _ref.hasError,
-    inFocus = _ref.inFocus,
+    _ref$inFocus = _ref.inFocus,
+    inFocus = _ref$inFocus === void 0 ? false : _ref$inFocus,
     placeholder = _ref.placeholder,
     onFocus = _ref.onFocus,
     onBlur = _ref.onBlur,
@@ -34,43 +34,25 @@ var Input = exports.Input = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
     required = _ref.required,
     _ref$useModernStyles = _ref.useModernStyles,
     useModernStyles = _ref$useModernStyles === void 0 ? false : _ref$useModernStyles;
-  var inputLabel = (0, _react.useMemo)(function () {
-    if (useModernStyles) {
-      if (value || inFocus) {
-        return label;
-      } else {
-        return undefined;
-      }
-    } else {
-      return label;
-    }
-  }, [inFocus, label, value, useModernStyles]);
+  var _useInputStyles = (0, _useInputStyles2.useInputStyles)({
+      isHaveValue: !!value,
+      useModernStyles: useModernStyles,
+      size: size,
+      label: label,
+      inFocus: inFocus,
+      placeholder: placeholder
+    }),
+    inputLabel = _useInputStyles.inputLabel,
+    paddingAndVariantOptions = _useInputStyles.paddingAndVariantOptions,
+    modernPlaceholder = _useInputStyles.modernPlaceholder;
   var isShowResetIcon = !!value && !!onReset;
-  var isModernPlaceholderVisible = (0, _react.useMemo)(function () {
-    return useModernStyles && !isOpen && !value;
-  }, [isOpen, useModernStyles, value]);
-  var modernInputPlaceholder = (0, _react.useMemo)(function () {
-    return placeholder || label;
-  }, [label, placeholder]);
-  var paddingOptions = (0, _react.useMemo)(function () {
-    if ((value || isOpen) && useModernStyles && label) {
-      return _constants.MODERN_STYLE_SIZE_PARAMS_MAP[size];
-    } else {
-      return _constants.SIZE_PARAMS_MAP[size];
-    }
-  }, [value, isOpen, useModernStyles, size, label]);
   return /*#__PURE__*/_react["default"].createElement(_InputLabel.InputLabel, {
     inFocus: inFocus,
     label: inputLabel,
     required: required,
     useModernStyles: useModernStyles,
     size: size
-  }, /*#__PURE__*/_react["default"].createElement(S.ControlWrapper, null, useModernStyles && modernInputPlaceholder && /*#__PURE__*/_react["default"].createElement(_ModernPlaceholder.ModernPlaceholder, {
-    visible: isModernPlaceholderVisible,
-    paddingTop: _constants.SIZE_PARAMS_MAP[size !== null && size !== void 0 ? size : 'M'].paddingTop,
-    size: size !== null && size !== void 0 ? size : 'M',
-    required: required
-  }, modernInputPlaceholder), /*#__PURE__*/_react["default"].createElement(_PureInput.PureInput, _extends({
+  }, /*#__PURE__*/_react["default"].createElement(S.ControlWrapper, null, modernPlaceholder, /*#__PURE__*/_react["default"].createElement(_PureInput.PureInput, _extends({
     ref: ref,
     hasError: hasError,
     inFocus: inFocus,
@@ -84,7 +66,7 @@ var Input = exports.Input = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
     paddingRight: 52,
     onClick: onClick,
     useModernStyles: useModernStyles
-  }, paddingOptions)), /*#__PURE__*/_react["default"].createElement(S.IconWrapper, {
+  }, paddingAndVariantOptions)), /*#__PURE__*/_react["default"].createElement(S.IconWrapper, {
     $pointerEvents: isShowResetIcon ? 'default' : 'none'
   }, isShowResetIcon ? /*#__PURE__*/_react["default"].createElement(_ResetButton.ResetButton, {
     onClick: onReset

package/dist/components/form/TextInput/index.js

@@ -10,8 +10,7 @@ var S = _interopRequireWildcard(require("./styles"));
 var _InputLabel = require("../InputLabel");
 var _PureInput = require("../PureInput");
 var _useInputFocus2 = require("../../../hooks/useInputFocus");
-var _constants = require("../constants");
-var _ModernPlaceholder = require("../ModernPlaceholder");
+var _useInputStyles2 = require("../_hooks/useInputStyles");
 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; }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
@@ -52,33 +51,20 @@ var TextInput = exports.TextInput = /*#__PURE__*/_react["default"].forwardRef(fu
     inFocus = _useInputFocus.inFocus,
     handleFocus = _useInputFocus.handleFocus,
     handleBlur = _useInputFocus.handleBlur;
+  var _useInputStyles = (0, _useInputStyles2.useInputStyles)({
+      isHaveValue: !!value,
+      useModernStyles: useModernStyles,
+      size: size,
+      label: label,
+      inFocus: inFocus,
+      placeholder: placeholder
+    }),
+    inputLabel = _useInputStyles.inputLabel,
+    paddingAndVariantOptions = _useInputStyles.paddingAndVariantOptions,
+    modernPlaceholder = _useInputStyles.modernPlaceholder;
   var handleChange = (0, _react.useCallback)(function (event) {
     onChange(event.target.value.slice(0, maxLength !== null && maxLength !== void 0 ? maxLength : Infinity));
   }, [onChange, maxLength]);
-  var inputLabel = (0, _react.useMemo)(function () {
-    if (useModernStyles) {
-      if (value || inFocus) {
-        return label;
-      } else {
-        return undefined;
-      }
-    } else {
-      return label;
-    }
-  }, [inFocus, label, value, useModernStyles]);
-  var paddingOptions = (0, _react.useMemo)(function () {
-    if ((value || inFocus) && useModernStyles && inputLabel) {
-      return _constants.MODERN_STYLE_SIZE_PARAMS_MAP[size];
-    } else {
-      return _constants.SIZE_PARAMS_MAP[size];
-    }
-  }, [value, inFocus, useModernStyles, size, inputLabel]);
-  var modernInputPlaceholder = (0, _react.useMemo)(function () {
-    return placeholder || label;
-  }, [label, placeholder]);
-  var isModernPlaceholderVisible = (0, _react.useMemo)(function () {
-    return !inFocus && !value;
-  }, [inFocus, value]);
   return /*#__PURE__*/_react["default"].createElement(_InputLabel.InputLabel, {
     inFocus: inFocus,
     label: inputLabel,
@@ -86,12 +72,7 @@ var TextInput = exports.TextInput = /*#__PURE__*/_react["default"].forwardRef(fu
     required: required,
     size: size,
     useModernStyles: useModernStyles
-  }, /*#__PURE__*/_react["default"].createElement(S.InputLabelContent, null, useModernStyles && modernInputPlaceholder && /*#__PURE__*/_react["default"].createElement(_ModernPlaceholder.ModernPlaceholder, {
-    visible: isModernPlaceholderVisible,
-    paddingTop: _constants.SIZE_PARAMS_MAP[size].paddingTop,
-    size: size,
-    required: required
-  }, modernInputPlaceholder), /*#__PURE__*/_react["default"].createElement(_PureInput.PureInput, _extends({
+  }, /*#__PURE__*/_react["default"].createElement(S.InputLabelContent, null, modernPlaceholder, /*#__PURE__*/_react["default"].createElement(_PureInput.PureInput, _extends({
     id: id,
     ref: ref,
     name: name,
@@ -113,6 +94,6 @@ var TextInput = exports.TextInput = /*#__PURE__*/_react["default"].forwardRef(fu
     inputMode: inputMode,
     readOnly: readOnly,
     autoComplete: autoComplete
-  }, paddingOptions)), children && /*#__PURE__*/_react["default"].createElement(S.ChildrenWrapper, null, children)));
+  }, paddingAndVariantOptions)), children && /*#__PURE__*/_react["default"].createElement(S.ChildrenWrapper, null, children)));
 });
 TextInput.displayName = 'TextInput';

package/dist/components/form/_hooks/useInputStyles.d.ts

@@ -0,0 +1,23 @@
+import { TSizes } from '../constants';
+type TParams = {
+    inFocus: boolean;
+    size: TSizes;
+    isHaveValue: boolean;
+    useModernStyles?: boolean;
+    label?: string;
+    placeholder?: string;
+    required?: boolean;
+    conditionHideModernPlaceholder?: boolean;
+};
+export declare const useInputStyles: ({ inFocus, useModernStyles, label, size, placeholder, isHaveValue, required, conditionHideModernPlaceholder, }: TParams) => {
+    inputLabel: string | undefined;
+    paddingAndVariantOptions: {
+        paddingTop: number;
+        paddingBottom: number;
+        variant: "headline1" | "headline2" | "headline3" | "headline4" | "headline5" | "headline6" | "headerText" | "buttonL" | "bodyL" | "bodyLUnderlined" | "buttonM" | "bodyMRegular" | "bodyMBold" | "bodyMUnderlined" | "captionRegular" | "labelsHintsRegular" | "labelsHintsBold" | "captionSRegular" | "captionUnderlined" | "smallMedium" | "labelsAndHints";
+    };
+    modernInputPlaceholder: string | undefined;
+    isHideModernPlaceholder: boolean;
+    modernPlaceholder: false | "" | import("react/jsx-runtime").JSX.Element | undefined;
+};
+export {};

package/dist/components/form/_hooks/useInputStyles.js

@@ -0,0 +1,66 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useInputStyles = void 0;
+var _constants = require("../constants");
+var _react = _interopRequireWildcard(require("react"));
+var _ModernPlaceholder = require("../ModernPlaceholder");
+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; }
+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); }
+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; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+var useInputStyles = exports.useInputStyles = function useInputStyles(_ref) {
+  var inFocus = _ref.inFocus,
+    useModernStyles = _ref.useModernStyles,
+    label = _ref.label,
+    size = _ref.size,
+    placeholder = _ref.placeholder,
+    isHaveValue = _ref.isHaveValue,
+    required = _ref.required,
+    _ref$conditionHideMod = _ref.conditionHideModernPlaceholder,
+    conditionHideModernPlaceholder = _ref$conditionHideMod === void 0 ? false : _ref$conditionHideMod;
+  var isHideModernPlaceholder = isHaveValue || inFocus || conditionHideModernPlaceholder;
+  var inputLabel = (0, _react.useMemo)(function () {
+    if (useModernStyles) {
+      return isHideModernPlaceholder ? label : undefined;
+    } else {
+      return label;
+    }
+  }, [useModernStyles, isHideModernPlaceholder, label]);
+  var paddingAndVariantOptions = (0, _react.useMemo)(function () {
+    if (useModernStyles) {
+      if (isHideModernPlaceholder) {
+        return _constants.MODERN_STYLE_SIZE_PARAMS_MAP[size];
+      } else {
+        return _objectSpread(_objectSpread({}, _constants.MODERN_STYLE_SIZE_PARAMS_MAP[size]), {}, {
+          paddingTop: _constants.MODERN_STYLE_SIZE_PARAMS_MAP[size].$placeholderPaddingTop,
+          paddingBottom: _constants.MODERN_STYLE_SIZE_PARAMS_MAP[size].$placeholderPaddingTop
+        });
+      }
+    } else {
+      return _constants.SIZE_PARAMS_MAP[size];
+    }
+  }, [useModernStyles, isHideModernPlaceholder, size]);
+  var modernInputPlaceholder = (0, _react.useMemo)(function () {
+    return placeholder || label;
+  }, [label, placeholder]);
+  var modernPlaceholder = useModernStyles && modernInputPlaceholder && /*#__PURE__*/_react["default"].createElement(_ModernPlaceholder.ModernPlaceholder, {
+    visible: !isHideModernPlaceholder,
+    paddingTop: _constants.MODERN_STYLE_SIZE_PARAMS_MAP[size].$placeholderPaddingTop,
+    size: size,
+    required: required
+  }, modernInputPlaceholder);
+  return {
+    inputLabel: inputLabel,
+    paddingAndVariantOptions: paddingAndVariantOptions,
+    modernInputPlaceholder: modernInputPlaceholder,
+    isHideModernPlaceholder: isHideModernPlaceholder,
+    modernPlaceholder: modernPlaceholder
+  };
+};

package/dist/components/form/constants.d.ts

@@ -11,4 +11,5 @@ export declare const MODERN_STYLE_SIZE_PARAMS_MAP: Record<TSizes, {
     variant: keyof typeof typography;
     $labelVariant: keyof typeof typography;
     $labelPaddingTop: number;
+    $placeholderPaddingTop: number;
 }>;

package/dist/components/form/constants.js

@@ -23,24 +23,27 @@ var SIZE_PARAMS_MAP = exports.SIZE_PARAMS_MAP = {
 };
 var MODERN_STYLE_SIZE_PARAMS_MAP = exports.MODERN_STYLE_SIZE_PARAMS_MAP = {
   L: {
-    paddingTop: 20,
-    paddingBottom: 12,
-    variant: 'bodyMRegular',
-    $labelVariant: 'captionRegular',
-    $labelPaddingTop: 14
+    paddingTop: 24,
+    paddingBottom: 8,
+    variant: 'headline5',
+    $labelVariant: 'labelsHintsRegular',
+    $labelPaddingTop: 8,
+    $placeholderPaddingTop: 16
   },
   M: {
     paddingTop: 20,
-    paddingBottom: 6,
-    variant: 'bodyMRegular',
-    $labelVariant: 'captionRegular',
-    $labelPaddingTop: 12
+    paddingBottom: 4,
+    variant: 'bodyL',
+    $labelVariant: 'labelsHintsRegular',
+    $labelPaddingTop: 4,
+    $placeholderPaddingTop: 12
   },
   XS: {
-    paddingTop: 16,
-    paddingBottom: 4,
-    variant: 'labelsHintsRegular',
-    $labelVariant: 'captionSRegular',
-    $labelPaddingTop: 12
+    paddingTop: 6,
+    paddingBottom: 6,
+    variant: 'headline5',
+    $labelVariant: 'labelsHintsRegular',
+    $labelPaddingTop: -18,
+    $placeholderPaddingTop: 6
   }
 };

package/dist/esm/components/form/Autocomplete/components/Autocomplete/index.js

@@ -5,7 +5,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 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(r) { if (Array.isArray(r)) return r; }
-import React, { forwardRef, useCallback, useEffect, useId, useMemo, useRef, useState } from 'react';
+import React, { forwardRef, useCallback, useEffect, useId, useRef, useState } from 'react';
 import * as S from './styles';
 import { AutocompleteDefaultOption } from '../AutocompleteDefaultOption';
 import { Skeleton } from '../../../../common/Skeleton';
@@ -16,10 +16,11 @@ import { InputLabel } from '../../../InputLabel';
 import { PureInput } from '../../../PureInput';
 import { Dropdown } from '../../../../common/Dropdown';
 import { Scrollbar } from '../../../../common/Scrollbar';
-import { MODERN_STYLE_SIZE_PARAMS_MAP, SIZE_PARAMS_MAP } from '../../../constants';
+import { MODERN_STYLE_SIZE_PARAMS_MAP } from '../../../constants';
 import { useComponentPalette } from '../../../../../palette';
-import { ModernPlaceholder } from '../../../ModernPlaceholder';
 import { LABEL_PADDING } from '../../../InputLabel/constants';
+import { useInputStyles } from '../../../_hooks/useInputStyles';
+import { ModernPlaceholder } from '../../../ModernPlaceholder';
 var DefaultSkeletonItem = function DefaultSkeletonItem() {
   return /*#__PURE__*/React.createElement(S.DefaultSkeletonWrapper, null, /*#__PURE__*/React.createElement(Skeleton, {
     height: "20px"
@@ -81,6 +82,18 @@ export var Autocomplete = /*#__PURE__*/forwardRef(function (_ref, ref) {
     inFocus = _useInputFocus.inFocus,
     handleFocus = _useInputFocus.handleFocus,
     handleBlur = _useInputFocus.handleBlur;
+  var _useInputStyles = useInputStyles({
+      isHaveValue: !!value,
+      useModernStyles: useModernStyles,
+      size: size,
+      label: label,
+      inFocus: inFocus,
+      placeholder: placeholder
+    }),
+    inputLabel = _useInputStyles.inputLabel,
+    paddingAndVariantOptions = _useInputStyles.paddingAndVariantOptions,
+    isHideModernPlaceholder = _useInputStyles.isHideModernPlaceholder,
+    modernInputPlaceholder = _useInputStyles.modernInputPlaceholder;
   var handleOpen = useCallback(function () {
     return setIsOpen(true);
   }, []);
@@ -105,30 +118,6 @@ export var Autocomplete = /*#__PURE__*/forwardRef(function (_ref, ref) {
     handleOpen();
     handleFocus(event);
   }, [handleOpen, handleFocus]);
-  var inputLabel = useMemo(function () {
-    if (useModernStyles) {
-      if (value || isOpen) {
-        return label;
-      } else {
-        return undefined;
-      }
-    } else {
-      return label;
-    }
-  }, [isOpen, label, value, useModernStyles]);
-  var paddingOptions = useMemo(function () {
-    if ((value || isOpen) && useModernStyles && inputLabel) {
-      return MODERN_STYLE_SIZE_PARAMS_MAP[size];
-    } else {
-      return SIZE_PARAMS_MAP[size];
-    }
-  }, [value, isOpen, useModernStyles, size, inputLabel]);
-  var modernInputPlaceholder = useMemo(function () {
-    return placeholder || label;
-  }, [label, placeholder]);
-  var isModernPlaceholderVisible = useMemo(function () {
-    return !isOpen && !value;
-  }, [isOpen, value]);
   var isDropdownOpen = !isDropdownDisabled && isOpen && (!!options.length || !!isLoading);
   // Скелетоны показываем ТОЛЬКО когда опций ещё нет (первая загрузка). При повторных запросах
   // (ввод символов) держим прежние опции — иначе лоадер мерцает на каждое изменение.
@@ -192,9 +181,9 @@ export var Autocomplete = /*#__PURE__*/forwardRef(function (_ref, ref) {
     size: size,
     left: useModernStyles && typeof inputPaddingLeft === 'number' ? inputPaddingLeft - LABEL_PADDING : undefined
   }, /*#__PURE__*/React.createElement(S.InputLabelContent, null, children ? /*#__PURE__*/React.createElement(S.ChildrenWrapper, null, children) : null, useModernStyles && modernInputPlaceholder && /*#__PURE__*/React.createElement(ModernPlaceholder, {
-    visible: isModernPlaceholderVisible,
+    visible: !isHideModernPlaceholder,
     paddingLeft: typeof inputPaddingLeft === 'number' ? inputPaddingLeft : 20,
-    paddingTop: SIZE_PARAMS_MAP[size].paddingTop,
+    paddingTop: MODERN_STYLE_SIZE_PARAMS_MAP[size].$placeholderPaddingTop,
     size: size,
     required: required
   }, modernInputPlaceholder), /*#__PURE__*/React.createElement(PureInput, _extends({
@@ -220,7 +209,7 @@ export var Autocomplete = /*#__PURE__*/forwardRef(function (_ref, ref) {
     "aria-controls": isDropdownOpen ? listboxId : undefined,
     "aria-autocomplete": "list",
     "aria-activedescendant": isDropdownOpen && activeIndex >= 0 ? getOptionId(activeIndex) : undefined
-  }, paddingOptions)))), /*#__PURE__*/React.createElement(Dropdown, {
+  }, paddingAndVariantOptions)))), /*#__PURE__*/React.createElement(Dropdown, {
     ref: dropdownRef,
     isOpen: isOpen && (!!options.length || !!isLoading),
     isAutoPosition: true,

package/dist/esm/components/form/CurrencyInput/CoreCurrencyInput/index.js

@@ -1,10 +1,9 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import { InputLabel } from '../../InputLabel';
 import { useInputFocus } from '../../../../hooks/useInputFocus';
 import { StyledCurrencyInputFromLibrary, InputWrapper } from './styles';
-import { MODERN_STYLE_SIZE_PARAMS_MAP, SIZE_PARAMS_MAP } from '../../constants';
 import { useComponentPalette } from '../../../../palette';
-import { ModernPlaceholder } from '../../ModernPlaceholder';
+import { useInputStyles } from '../../_hooks/useInputStyles';
 export var CoreCurrencyInput = function CoreCurrencyInput(_ref) {
   var label = _ref.label,
     _ref$size = _ref.size,
@@ -31,27 +30,17 @@ export var CoreCurrencyInput = function CoreCurrencyInput(_ref) {
     handleFocus = _useInputFocus.handleFocus,
     handleBlur = _useInputFocus.handleBlur;
   var palette = useComponentPalette('pureInput');
-  var inputLabel = useMemo(function () {
-    if (useModernStyles) {
-      if (typeof defaultValue === 'number' || inFocus || typeof value === 'number') {
-        return label;
-      } else {
-        return undefined;
-      }
-    } else {
-      return label;
-    }
-  }, [useModernStyles, defaultValue, inFocus, label, value]);
-  var paddingOptions = useMemo(function () {
-    if ((typeof defaultValue === 'number' || typeof value === 'number' || inFocus) && useModernStyles && inputLabel) {
-      return MODERN_STYLE_SIZE_PARAMS_MAP[size];
-    } else {
-      return SIZE_PARAMS_MAP[size];
-    }
-  }, [defaultValue, useModernStyles, size, inFocus, inputLabel, value]);
-  var isModernPlaceholderVisible = useMemo(function () {
-    return !inFocus && !defaultValue && defaultValue !== 0 && !value && value !== 0;
-  }, [defaultValue, inFocus, value]);
+  var _useInputStyles = useInputStyles({
+      isHaveValue: !!value || typeof defaultValue === 'number',
+      useModernStyles: useModernStyles,
+      size: size,
+      label: label,
+      inFocus: inFocus,
+      placeholder: ''
+    }),
+    modernPlaceholder = _useInputStyles.modernPlaceholder,
+    paddingAndVariantOptions = _useInputStyles.paddingAndVariantOptions,
+    inputLabel = _useInputStyles.inputLabel;
   return /*#__PURE__*/React.createElement(InputLabel, {
     inFocus: inFocus,
     label: inputLabel,
@@ -59,21 +48,15 @@ export var CoreCurrencyInput = function CoreCurrencyInput(_ref) {
     required: required,
     useModernStyles: useModernStyles,
     size: size
-  }, /*#__PURE__*/React.createElement(InputWrapper, null, useModernStyles && label && /*#__PURE__*/React.createElement(ModernPlaceholder, {
-    visible: isModernPlaceholderVisible,
-    paddingLeft: 18,
-    paddingTop: SIZE_PARAMS_MAP[size].paddingTop,
-    size: size,
-    required: required
-  }, label), /*#__PURE__*/React.createElement(StyledCurrencyInputFromLibrary, {
+  }, /*#__PURE__*/React.createElement(InputWrapper, null, modernPlaceholder, /*#__PURE__*/React.createElement(StyledCurrencyInputFromLibrary, {
     $palette: palette,
     $hasBorder: !useModernStyles,
     $paddingLeft: 18,
     $paddingRight: 18,
     $borderRadius: 10,
-    $variant: paddingOptions.variant,
-    $paddingTop: paddingOptions.paddingTop,
-    $paddingBottom: paddingOptions.paddingBottom,
+    $variant: paddingAndVariantOptions.variant,
+    $paddingTop: paddingAndVariantOptions.paddingTop,
+    $paddingBottom: paddingAndVariantOptions.paddingBottom,
     $hasError: hasError,
     $inFocus: inFocus,
     onBlur: handleBlur,

package/dist/esm/components/form/DateInput/index.js

@@ -5,7 +5,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 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(r) { if (Array.isArray(r)) return r; }
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import * as S from './styles';
 import { logic } from './logic';
 import { useOutsideClick } from '../../../hooks/useOutsideClick';
@@ -16,10 +16,9 @@ import { Dropdown } from '../../common/Dropdown';
 import { Calendar } from '../../common/Calendar';
 import { CalendarIcon } from './components/CalendarIcon';
 import { useComponentPalette } from '../../../palette';
-import { MODERN_STYLE_SIZE_PARAMS_MAP, SIZE_PARAMS_MAP } from '../constants';
-import { ModernPlaceholder } from '../ModernPlaceholder';
 import { useMobile } from '../../../index';
 import { MobileDrawerDateCalendar } from './components/MobileDrawerDateCalendar';
+import { useInputStyles } from '../_hooks/useInputStyles';
 var resetValue = null;
 export var DateInput = function DateInput(_ref) {
   var onChange = _ref.onChange,
@@ -71,6 +70,18 @@ export var DateInput = function DateInput(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     stringValue = _useState4[0],
     setStringValue = _useState4[1];
+  var _useInputStyles = useInputStyles({
+      isHaveValue: !!stringValue,
+      useModernStyles: useModernStyles,
+      size: size,
+      label: label,
+      inFocus: inFocus,
+      placeholder: placeholder,
+      conditionHideModernPlaceholder: isOpen
+    }),
+    inputLabel = _useInputStyles.inputLabel,
+    paddingAndVariantOptions = _useInputStyles.paddingAndVariantOptions,
+    modernPlaceholder = _useInputStyles.modernPlaceholder;
   useEffect(function () {
     if (stringValue && value === resetValue) {
       setStringValue('');
@@ -95,37 +106,6 @@ export var DateInput = function DateInput(_ref) {
     setStringValue(logic.valueToString(newValue, false));
     onChange(newValue);
   }, [handleClose, onChange]);
-  var inputLabel = useMemo(function () {
-    if (useModernStyles) {
-      if (stringValue || isOpen) {
-        return label;
-      } else {
-        return undefined;
-      }
-    } else {
-      return label;
-    }
-  }, [isOpen, label, stringValue, useModernStyles]);
-  var paddingOptions = useMemo(function () {
-    if ((stringValue || isOpen) && useModernStyles && inputLabel) {
-      return MODERN_STYLE_SIZE_PARAMS_MAP[size];
-    } else {
-      return SIZE_PARAMS_MAP[size];
-    }
-  }, [stringValue, isOpen, useModernStyles, size, inputLabel]);
-  var inputPlaceholder = useMemo(function () {
-    if (useModernStyles) {
-      return undefined;
-    } else {
-      return placeholder || logic.getPlaceholder();
-    }
-  }, [placeholder, useModernStyles]);
-  var modernPlaceholderText = useMemo(function () {
-    return placeholder || label || logic.getPlaceholder();
-  }, [label, placeholder]);
-  var isModernPlaceholderVisible = useMemo(function () {
-    return !isOpen && !stringValue;
-  }, [isOpen, stringValue]);
   return /*#__PURE__*/React.createElement(S.Wrapper, {
     ref: isMobile ? undefined : elRef
   }, /*#__PURE__*/React.createElement(InputLabel, {
@@ -134,25 +114,20 @@ export var DateInput = function DateInput(_ref) {
     useModernStyles: useModernStyles,
     size: size,
     required: required
-  }, /*#__PURE__*/React.createElement(S.InputWrapper, null, useModernStyles && /*#__PURE__*/React.createElement(ModernPlaceholder, {
-    visible: isModernPlaceholderVisible,
-    paddingTop: SIZE_PARAMS_MAP[size].paddingTop,
-    required: required,
-    size: size
-  }, modernPlaceholderText), /*#__PURE__*/React.createElement(PureInput, _extends({
+  }, /*#__PURE__*/React.createElement(S.InputWrapper, null, modernPlaceholder, /*#__PURE__*/React.createElement(PureInput, _extends({
     onClick: handleTrigger,
     ref: inputRef,
     hasError: hasError,
     inFocus: inFocus,
     name: name,
-    placeholder: inputPlaceholder,
+    placeholder: useModernStyles ? undefined : placeholder || logic.getPlaceholder(),
     onFocus: handleFocus,
     onBlur: handleBlur,
     value: stringValue,
     onChange: handleStringValueChange,
     paddingRight: 44,
     useModernStyles: useModernStyles
-  }, paddingOptions)), /*#__PURE__*/React.createElement(S.Icon, {
+  }, paddingAndVariantOptions)), /*#__PURE__*/React.createElement(S.Icon, {
     onClick: handleTrigger,
     $palette: palette
   }, /*#__PURE__*/React.createElement(CalendarIcon, null)))), isMobile ? /*#__PURE__*/React.createElement(MobileDrawerDateCalendar, {