@steroidsjs/bootstrap 3.0.0-beta.1 → 3.0.0-beta.100

package/form/ImageField/ImageFieldModalView.js

@@ -45,6 +45,8 @@ var Modal_1 = __importDefault(require("@steroidsjs/core/ui/modal/Modal"));
 require("react-image-crop/dist/ReactCrop.css");
 function ImageFieldModalView(props) {
     var bem = (0, hooks_1.useBem)('ImageFieldModalView');
+    //TODO Исправить тип, связано с yarn tsc в action publish.yml
+    var ReactCrop = react_image_crop_1["default"];
     var _a = (0, react_1.useState)(props.crop.initialValues), crop = _a[0], setCrop = _a[1];
     return (React.createElement(Modal_1["default"], { className: bem.block(), title: props.title || __('Выберите область изображения'), onClose: props.onClose, controls: [{
                 label: __(('Сохранить')),
@@ -54,6 +56,6 @@ function ImageFieldModalView(props) {
                 }
             }] },
         React.createElement("div", { className: 'mb-3' },
-            React.createElement(react_image_crop_1["default"], __assign({}, props.crop.reactImageCropProps, { className: bem.element('crop'), src: props.image && props.image.url, crop: crop, onChange: setCrop })))));
+            React.createElement(ReactCrop, __assign({}, props.crop.reactImageCropProps, { className: bem.element('crop'), src: props.image && props.image.url, crop: crop, onChange: setCrop })))));
 }
 exports["default"] = ImageFieldModalView;

package/form/ImageField/ImageFieldView.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
-import { IImageFieldViewProps } from "@steroidsjs/core/ui/form/ImageField/ImageField";
+import { IImageFieldViewProps } from '@steroidsjs/core/ui/form/ImageField/ImageField';
 export default function ImageFieldView(props: IImageFieldViewProps): JSX.Element;

package/form/ImageField/ImageFieldView.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -28,20 +39,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 var React = __importStar(require("react"));
 var hooks_1 = require("@steroidsjs/core/hooks");
-var Icon_1 = __importDefault(require("@steroidsjs/core/ui/icon/Icon"));
+var Icon_1 = __importDefault(require("@steroidsjs/core/ui/content/Icon"));
+var form_1 = require("@steroidsjs/core/ui/form");
 function ImageFieldView(props) {
-    var bem = (0, hooks_1.useBem)("ImageFieldView");
+    var bem = (0, hooks_1.useBem)('ImageFieldView');
     var item = props.item;
-    return (React.createElement("div", { className: bem.block() }, !item || !item.image ? (React.createElement("button", { className: bem.element("button", {
+    return (React.createElement("div", { className: bem.block() }, !item || !item.image ? (React.createElement(form_1.Button, __assign({ className: bem.element('button', {
             loading: item ? item.progress : false
-        }), onClick: props.onClick },
-        !item || !item.progress ? (React.createElement(Icon_1["default"], { className: bem.element("button-icon"), name: 'plus' })) : (React.createElement("div", { className: bem.element("progress-bar") },
-            React.createElement("div", { className: bem.element("progress-slider"), style: {
+        }), onClick: props.onClick }, props.buttonProps),
+        !item || !item.progress ? (React.createElement(Icon_1["default"], { className: bem.element('button-icon'), name: 'add' })) : (React.createElement("div", { className: bem.element('progress-bar') },
+            React.createElement("div", { className: bem.element('progress-slider'), style: {
                     width: "".concat(item ? item.progress.percent : 0, "%")
                 } }))),
-        React.createElement("span", { className: bem.element("button-label") }, !item || !item.progress ? props.label : "Uploading..."))) : (React.createElement("div", { className: bem.element("content") },
-        React.createElement("img", { className: bem.element("image"), src: item.image.url, width: item.image.width, height: item.image.height, alt: item.title }),
-        React.createElement("div", { className: bem.element("image-controls") },
-            React.createElement(Icon_1["default"], { className: bem.element("delete-icon"), name: 'trash', onClick: item.onRemove }))))));
+        React.createElement("span", { className: bem.element('button-label') }, !item || !item.progress ? props.label : 'Uploading...'))) : (React.createElement("div", { className: bem.element('content') },
+        React.createElement("img", { className: bem.element('image'), src: item.image.url, width: item.image.width, height: item.image.height, alt: item.title }),
+        React.createElement("div", { className: bem.element('image-controls') },
+            React.createElement(Icon_1["default"], { className: bem.element('delete-icon'), name: 'trash', onClick: item.onRemove }))))));
 }
 exports["default"] = ImageFieldView;

package/form/ImageField/ImageFieldView.scss

@@ -1,43 +1,26 @@
+@use "../../scss/variables";
+
 .ImageFieldView {
   $root: &;
 
-  width: 128px;
-  height: 128px;
-
   &__button {
     display: flex;
     align-items: center;
-    justify-content: center;
-    flex-direction: column;
-    width: 100%;
-    height: 100%;
-    background: #ebebeb;
-    border: 1px dashed #b0b0b0;
-    border-radius: 10px;
+    min-width: 200px;
 
     &_loading {
       pointer-events: none;
     }
   }
 
-  &__button-icon {
+  .ButtonView__text {
     display: flex;
-
-    svg {
-      width: 12px;
-      height: 12px;
-    }
-
-    path {
-      fill: #152536
-    }
+    column-gap: 6px;
   }
 
   &__button-label {
-    margin-top: 18px;
-    font-size: 14px;
-    line-height: 140%;
-    color: #152536;
+    font-size: 16px;
+    color: variables.$text-color;
   }
 
   &__progress-bar {

package/form/InputField/InputFieldView.d.ts

@@ -1,4 +1,2 @@
-/// <reference types="react" />
-import { IBemHocOutput } from '@steroidsjs/core/hoc/bem';
 import { IInputFieldViewProps } from '@steroidsjs/core/ui/form/InputField/InputField';
-export default function InputFieldView(props: IInputFieldViewProps & IBemHocOutput): JSX.Element;
+export default function InputFieldView(props: IInputFieldViewProps): JSX.Element;

package/form/InputField/InputFieldView.js

@@ -33,28 +33,47 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 exports.__esModule = true;
+/* eslint-disable import/no-extraneous-dependencies */
 var React = __importStar(require("react"));
 var hooks_1 = require("@steroidsjs/core/hooks");
+var Icon_1 = __importDefault(require("@steroidsjs/core/ui/content/Icon"));
+var renderIcon_1 = __importDefault(require("../../utils/renderIcon"));
 function InputFieldView(props) {
+    var _a;
     var bem = (0, hooks_1.useBem)('InputFieldView');
     return (React.createElement("div", { className: bem(bem.block({
-            disabled: props.inputProps.disabled,
-            size: props.size
-        }), 'form-control', 'form-control-' + props.size, !!props.errors && 'is-invalid', props.className), style: props.style },
+            disabled: (_a = props.inputProps) === null || _a === void 0 ? void 0 : _a.disabled,
+            size: props.size,
+            hasError: !!props.errors,
+            hasLeadIcon: !!props.leadIcon,
+            hasClearIcon: props.showClear && !props.disabled,
+            filled: !!props.input.value,
+            hasAddonAfter: !!props.addonAfter,
+            hasAddonBefore: !!props.addonBefore,
+            hasAddon: !!props.addonAfter || !!props.addonBefore,
+            hasTextAddon: !!props.textAfter || !!props.textBefore,
+            hasTextAddonBefore: !!props.textBefore,
+            hasTextAddonAfter: !!props.textAfter
+        }), props.className), style: props.style },
         props.addonBefore && (React.createElement("span", { className: bem.element('addon-before') }, props.addonBefore)),
         props.textBefore && (React.createElement("span", { className: bem.element('text-before') }, props.textBefore)),
-        props.maskProps
-            ? (React.createElement("input", __assign({ onBlur: props.onBlur, onFocus: props.onFocus, onMouseDown: props.onMouseDown, className: bem(bem.element('input', {
-                    size: props.size,
-                    disabled: props.inputProps.disabled
-                }), !!props.errors && 'is-invalid') }, props.inputProps, { type: props.type, placeholder: props.placeholder, disabled: props.disabled, required: props.required })))
-            : (React.createElement("input", __assign({ className: bem(bem.element('input', {
-                    size: props.size,
-                    disabled: props.disabled,
-                    success: props.success,
-                    failed: props.failed
-                }), !!props.errors && 'is-invalid') }, props.inputProps, { onChange: function (e) { return props.input.onChange(e.target.value); }, type: props.type, placeholder: props.placeholder, disabled: props.disabled, required: props.required }))),
+        React.createElement("div", { className: bem.element('input-wrapper') },
+            props.leadIcon && (0, renderIcon_1["default"])(props.leadIcon, {
+                className: bem.element('lead-icon'),
+                tabIndex: -1
+            }),
+            props.maskOptions
+                ? (React.createElement("input", __assign({ onBlur: props.onBlur, onFocus: props.onFocus, onMouseDown: props.onMouseDown, className: bem(bem.element('input', {
+                        size: props.size
+                    })) }, props.inputProps, { type: props.type, placeholder: props.placeholder, disabled: props.disabled, required: props.required, id: props.id, ref: props.inputRef })))
+                : (React.createElement("input", __assign({ className: bem(bem.element('input', {
+                        size: props.size
+                    })) }, props.inputProps, { type: props.type, placeholder: props.placeholder, disabled: props.disabled, required: props.required, id: props.id, ref: props.inputRef }))),
+            !props.disabled && props.showClear && !props.maskProps && (React.createElement(Icon_1["default"], { name: "cross_8x8", className: bem.element('icon-clear'), tabIndex: -1, onClick: props.onClear }))),
         props.textAfter && (React.createElement("span", { className: bem.element('text-after') }, props.textAfter)),
         props.addonAfter && (React.createElement("span", { className: bem.element('addon-after') }, props.addonAfter))));
 }

package/form/InputField/InputFieldView.scss

@@ -1,134 +1,312 @@
+@use "../../scss/variables";
+
+:root {
+    --lead-icon-default-color: #e5e9eb;
+    --lead-icon-focus-color: #323232;
+    --lead-icon-disabled-color: rgba(0, 0, 0, 0.1);
+}
+
+html[data-theme="dark"] {
+    --lead-icon-default-color: #5b5c6b;
+    --lead-icon-focus-color: #ffffff;
+    --lead-icon-disabled-color: rgba(255, 255, 255, 0.1);
+}
+
+$lead-icon-default-color: var(--lead-icon-default-color);
+$lead-icon-focus-color: var(--lead-icon-focus-color);
+$lead-icon-disabled-color: var(--lead-icon-disabled-color);
+
 .InputFieldView {
-  $root: &;
+    $root: &;
 
-  display: flex;
-  flex-flow: row nowrap;
-  align-items: stretch;
-  padding: 0;
-  border: $input-border;
-  border-radius: $input-border-radius;
+    position: relative;
+    display: flex;
+    flex-flow: row nowrap;
+    align-items: center;
 
-  &_size {
-    &_small {
-      height: $input-height-sm;
-    }
-    &_medium {
-      height: $input-height-md;
-    }
-    &_large {
-      height: $input-height-lg;
+    height: 34px;
+
+    font-family: variables.$font-family-nunito;
+    font-weight: variables.$font-weight-sm;
+    line-height: 24px;
+
+    &__input-wrapper {
+        position: relative;
+        width: 100%;
+        height: 100%;
     }
-  }
 
-  &:focus-within{
-    outline: 0;
-    border-color: $border-action;
-    box-shadow: 0 0 0 3px $border-typing, 0 0 0 3px $border-typing;
-  }
+    &__input {
+        color: variables.$text-color;
+        font-family: variables.$font-family-nunito;
 
-  &.is-invalid:focus-within{
-    border-color: $border-action;
-    box-shadow: 0 0 0 3px $border-typing, 0 0 0 3px $border-typing;
-  }
+        width: 100%;
+        height: 100%;
 
-  &_disabled {
-    color: rgba(0, 0, 0, .25);
-    background-color: $back-disabled;
-    cursor: not-allowed;
+        padding: 0 8px;
+        outline: none;
 
-    input {
-      cursor: inherit;
+        background-color: variables.$element-field-background-color;
+        border: 1px solid variables.$element-border-color;
+        border-radius: inherit;
+
+        white-space: nowrap; /* Запретить перенос текста */
+        overflow: hidden; /* Скрыть содержимое, выходящее за границы ячейки */
+        text-overflow: ellipsis; /* Добавить многоточие, если текст обрезается */
+
+        &::placeholder {
+            color: variables.$element-placeholder-color;
+            font-size: inherit;
+        }
     }
 
-    &#{$root}_input {
-      background-color: $back-disabled;
+   
+    //Statements
+    &::before { 
+        content: '';
+        position: absolute;
+        z-index: 2;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+
+        pointer-events: none;
+        transform: translate(-1px, -1px);
+        opacity: 0;
+        transition: opacity 150ms ease-in-out;
     }
-  }
 
-  &_caption {
+    &:not(#{$root}_disabled):focus-within::before {
+        border: 4px solid variables.$primary-light;
+        transform: translateX(-4px) translateY(-4px);
+        border-radius: 16px;
+        opacity: 1;
+    }
 
-  }
+    &:not(#{$root}_disabled):active {
+        #{$root}__input { 
+            border-color: transparent;
+        }
+        
+        &::before { 
+            transform: none;
+            border: 1px solid variables.$primary;
+            opacity: 1;
+        }
+    }
 
-  &_failed {
-    background: $back-error;
-    &::after {
-      content: 'Error message';
-      color: $border-error;
+    &_disabled {
+        #{$root}__input { 
+            background-color: variables.$element-background-color-disabled;
+            border-color: transparent;
+        }
     }
-  }
 
-  &_success {
-    background: $back-success;
-    &::after {
-      content: 'Success message';
-      color: $border-success;
+    &_hasError {
+        #{$root}__input {
+            border-color: transparent;
+        }
+
+
+        &::before { 
+            border: 1px solid variables.$danger;
+            border-radius: 16px;
+            transform: translateX(-1px) translateY(-1px);
+            opacity: 1;
+        }
     }
-  }
 
-  &__input {
-    flex-grow: 1;
-    border: none;
-    outline: none;
-    background-color: $white;
-    overflow: hidden;
-    color: $heading;
-    padding: $input-padding-y $input-padding-x;
-    border-radius: $input-border-radius;
+    //Sizes
+    &_size {
+        &_lg {
+            color: variables.$text-color;
+            height: variables.$input-height-lg;
+            border-radius: variables.$radius-large;
+            
+            #{$root}__input {
+                font-size: variables.$font-size-lg;
+                border-radius: variables.$radius-large;
+            }
 
-    &_disabled {
-      color: rgba(0, 0, 0, .25);
-      background: $back-disabled;
-      cursor: not-allowed;
+            #{$root}__addon-before,
+            #{$root}__addon-after {
+                padding: 16px;
+            }
+            #{$root}__text-before,
+            #{$root}__text-after {
+                padding: 16px 3px;
+            }
+
+            &::before { 
+                border-radius: 14px;
+            }
+        }
+
+        &_md {
+            color: variables.$text-color;
+            height: variables.$input-height-md;
+            border-radius: variables.$radius-large;
+            
+            #{$root}__input {
+                border-radius: variables.$radius-large;
+                font-size: variables.$font-size-base;
+            }
+
+            #{$root}__addon-before,
+            #{$root}__addon-after,
+            #{$root}__text-before,
+            #{$root}__text-after {
+                padding: 11px 12px;
+            }
 
-      input {
-        cursor: inherit;
-      }
+            #{$root}__text-before,
+            #{$root}__text-after {
+                padding: 11px 3px;
+            }
+
+            &::before { 
+                border-radius: 14px;
+            }
+        }
+
+        &_sm {
+            color: variables.$text-color;
+            height: variables.$input-height-sm;
+            border-radius: variables.$radius-small;
+            
+            #{$root}__input {
+                font-size: variables.$font-size-sm;
+                border-radius: variables.$radius-small;
+            }
+
+            #{$root}__addon-before,
+            #{$root}__addon-after {
+                padding: 5px 8px;
+            }
+
+            #{$root}__text-before,
+            #{$root}__text-after {
+                padding: 5px 3px;
+            }
+
+            &::before { 
+                border-radius: 10px;
+            }
+        }
     }
 
-    &_failed {
-      box-sizing: border-box;
+    //LEAD ICON
+    &_hasLeadIcon {
+        #{$root}__input {
+            padding-left: 40px;
+        }
     }
 
-    &:active {
-      color: $heading;
+    &__lead-icon {
+        width: 24px;
+        height: 24px;
+        position: absolute;
+        top: 50%;
+        left: 8px;
+        transform: translateY(-50%);
+        pointer-events: none;
+        outline: none;
+
+        svg circle,
+        path {
+            transition: stroke 150ms ease-in-out;
+            stroke: $lead-icon-default-color;
+        }
     }
-    &:focus {
-      color: $heading;
+
+    //CLEAR ICON
+    &_hasClearIcon {
+        #{$root}__input {
+            padding-right: 40px;
+        }
     }
-  }
 
-  &__addon-before, &__addon-after {
-    display: flex;
-    align-items: center;
-    padding: 0 $input-addon-padding;
+    &__icon-clear {
+        svg > * {
+            stroke: variables.$text-color
+        }
 
-    color: rgba(0, 0, 0, .85);
-    text-align: center;
-    background-color: $back-disabled;
-  }
+        width: 24px;
+        height: 24px;
+        position: absolute;
+        top: 50%;
+        right: 8px;
+        transform: translateY(-50%);
 
-  &__addon-before {
-    border-radius: $input-border-radius 0 0 $input-border-radius;
-    border-right: 1px solid $input-border-color;
-  }
+        opacity: 0;
+        transition: opacity 150ms ease-in-out;
+        pointer-events: none;
 
-  &__addon-after {
-    border-radius: 0 $input-border-radius $input-border-radius 0;
-    border-left: 1px solid $input-border-color;
-  }
+        &:focus {
+            opacity: 1;
+            pointer-events: all;
+        }
+    }
 
+    &_filled {
+        #{$root}__icon-clear {
+            opacity: 1;
+            pointer-events: all;
+            cursor: pointer;
+        }
 
-  &__text-before, &__text-after {
-    display: flex;
-    align-items: center;
-  }
+        #{$root}__lead-icon {
+            svg circle,
+            path {
+                stroke: $lead-icon-focus-color;
+            }
+        }
+    }
+
+    &_hasAddonBefore {
+        #{$root}__input {
+            border-top-left-radius: 0;
+            border-bottom-left-radius: 0;
+            border: none;
+        }
+        &::before { 
+            border: 1px solid variables.$element-border-color;
+            opacity: 1;
+        }
+    }
 
-  &__text-before {
-    padding-left: $input-text-padding;
-  }
+    &_hasAddonAfter {
+        #{$root}__input {
+            border-top-right-radius: 0;
+            border-bottom-right-radius: 0;
+        }
+        &::before { 
+            border: 1px solid variables.$element-border-color;
+            opacity: 1;
+        }
+    }
 
-  &__text-after {
-    padding-right: $input-text-padding;
-  }
+    &__text-before,
+    &__text-after { 
+        flex-shrink: 0;
+    }
 
-}
+    &__addon-before,
+    &__addon-after {
+        flex-shrink: 0;
+        padding: 11px 12px;
+        background-color: variables.$element-background-color-disabled;
+        color: variables.$text-color;
+    }
+
+    &__addon-before {
+        border-top-left-radius: inherit;
+        border-bottom-left-radius: inherit;
+    }
+
+    &__addon-after {
+        border-top-right-radius: inherit;
+        border-bottom-right-radius: inherit;
+    }
+}

package/form/NumberField/NumberFieldView.d.ts

@@ -1,4 +1,2 @@
-/// <reference types="react" />
-import { IBemHocOutput } from '@steroidsjs/core/hoc/bem';
 import { INumberFieldViewProps } from '@steroidsjs/core/ui/form/NumberField/NumberField';
-export default function NumberFieldView(props: INumberFieldViewProps & IBemHocOutput): JSX.Element;
+export default function NumberFieldView(props: INumberFieldViewProps): JSX.Element;