@steroidsjs/bootstrap 3.0.0-beta.2 → 3.0.0-beta.21

package/form/Button/ButtonView.d.ts

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

package/form/Button/ButtonView.js

@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 var React = __importStar(require("react"));
 var isString_1 = __importDefault(require("lodash-es/isString"));
-var Icon_1 = __importDefault(require("@steroidsjs/core/ui/icon/Icon"));
+var Icon_1 = __importDefault(require("@steroidsjs/core/ui/content/Icon"));
 var hooks_1 = require("@steroidsjs/core/hooks");
 function ButtonView(props) {
     var _a;
@@ -38,14 +38,13 @@ function ButtonView(props) {
             ? props.label
             : (props.hint || null);
         return (React.createElement(React.Fragment, null,
-            props.isLoading && (React.createElement("div", { className: bem.element('preloader') },
-                React.createElement("span", { className: 'spinner-border spinner-border-sm', role: 'status', "aria-hidden": 'true' }))),
-            (props.showLabelOnLoading || !props.isLoading) && (React.createElement("span", { className: bem.element('label') },
+            props.isLoading && (React.createElement(Icon_1["default"], { className: bem.element('loader'), name: 'loader' })),
+            !props.isLoading && (React.createElement("span", { className: bem.element('label') },
                 props.icon && (React.createElement(Icon_1["default"], { name: props.icon, title: title, className: bem.element('icon', !props.label && 'without-label') })),
                 props.children))));
     };
     var renderBadge = function () {
-        if (!props.badge.enable) {
+        if (!props.badge || !props.badge.enable) {
             return null;
         }
         return (React.createElement("span", { className: bem('badge', props.badge.color && "badge-".concat(props.badge.color), bem.element('badge'), props.badge.className) }, props.badge.value));
@@ -61,14 +60,15 @@ function ButtonView(props) {
         _a.submitting = props.submitting,
         _a.loading = props.isLoading,
         _a.failed = props.isFailed,
-        _a.link = props.tag === 'a',
-        _a)), props.block && 'btn-block', props.link && 'btn-link', props.className);
+        _a.link = props.link,
+        _a.block = props.block,
+        _a)), props.className);
     if (props.tag === 'a') {
         return (React.createElement("a", { className: className, href: props.url, onClick: props.onClick, style: props.style, target: props.target },
             renderLabel(),
             renderBadge()));
     }
-    return (React.createElement("button", { title: props.hint, type: props.type, disabled: props.disabled, onClick: props.onClick, style: props.style, className: className },
+    return (React.createElement("button", { title: props.hint, type: props.type, disabled: props.disabled || props.isLoading, onClick: props.onClick, style: props.style, className: className },
         renderLabel(),
         renderBadge()));
 }

package/form/Button/ButtonView.scss

@@ -1,96 +1,134 @@
+$btn-font-weight-sm: 400;
+$btn-font-weight-lg: 800;
+$btn-line-height: 24px;
+$btn-letter-spacing: 0.1em;
+
 .ButtonView {
-  $root: &;
-
-  transition-property: color, background-color, border-color, box-shadow;
-  transition-duration: .15s;
-  transition-timing-function: ease-in-out;
-
-  &_button {
-    position: relative;
-    border-radius: $button-border-radius;
-    user-select: none;
-    border: $button-border;
-
-    padding: $button-padding-y $button-padding-x;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    font-weight: $button-font-weight;
-    font-size: $button-font-size;
-
-    @each $color, $value in $color-themes {
-      &#{$root}_color_#{$color} {
-        @include button-theme($value)
-      }
+    $root: &;
+
+    transition-property: color, background-color, border-color, box-shadow;
+    transition-duration: 0.15s;
+    transition-timing-function: ease-in-out;
+
+    width: 160px;
+
+    &_button {
+        position: relative;
+        border-radius: 8px;
+        user-select: none;
+        border: 3px solid transparent;
+
+        padding: 0 20px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        font-family: $font-family-nunito;
+        font-weight: $btn-font-weight-sm;
+        font-size: $font-size-sm;
+        line-height: $btn-line-height;
+        outline: none;
+
+        @each $colorName, $colorMap in $color-themes {
+            &#{$root}_color_#{$colorName} {
+                @include button-theme($colorMap, $colorName, $root);
+            }
+        }
+
+        @each $colorName, $colorMap in $color-themes {
+            &#{$root}_outline_#{$colorName} {
+                @include button-outline-theme($colorMap, $colorName, $root);
+            }
+        }
     }
 
-    @each $color, $value in $color-themes {
-      &#{$root}_outline_#{$color} {
-        @include button-outline-theme($value)
-      }
+    &_block {
+        display: block;
+        width: 100%;
+
+        #{$root}__label {
+            justify-content: center;
+        }
     }
 
-  }
+    &_link { 
+        display: inline;
+        width: auto;
+        #{$root}__label {
+            display: inline;
+        }
+    }
+
+    &_disabled {
+        opacity: 0.5;
+        color: rgba(0, 0, 0, 0.25);
+        cursor: not-allowed;
+        input {
+            cursor: inherit;
+        }
+    }
 
-  &_disabled {
-    opacity: .5;
-    color: rgba(0, 0, 0, .25);
-    cursor: not-allowed;
-    input {
-      cursor: inherit;
+    &_size {
+        &_sm {
+            height: 34px;
+            font-size: $font-size-sm;
+            border-radius: $radius-small;
+        }
+        &_md {
+            height: 46px;
+            font-size: $font-size-base;
+            border-radius: $radius-large;
+        }
+        &_lg {
+            height: 56px;
+            font-size: $font-size-lg;
+            border-radius: $radius-large;
+        }
     }
-  }
 
-  &_size {
-    &_sm {
-      height: $button-height-sm;
-      font-size: $button-font-size-sm;
+    &__label {
+        display: flex;
+        flex-direction: row;
+        column-gap: 10px;
     }
-    &_md {
-      height: $button-height-md;
-      font-size: $button-font-size-md;
+
+    &__icon {
+        &_without-label {
+            margin: 0;
+        }
     }
-    &_lg {
-      height: $button-height-lg;
-      font-size: $button-font-size-lg;
+
+    &_failed {
+        &,
+        &:hover {
+            border-color: $danger;
+            box-shadow: 0 0 1rem rgba($danger, 0.2);
+        }
     }
-  }
 
-  &_link {
-    justify-content: flex-start;
-    background-color: transparent;
-  }
+    &__preloader {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+    }
 
-  &__icon {
-    margin-right: 3px;
+    &__badge {
+        position: relative;
+        top: -1px;
+        margin-left: 4px;
+    }
 
-    &_without-label {
-      margin: 0;
+    &__loader {
+        svg {
+            transform-origin: center;
+            animation: rotate 1.45s linear infinite;
+        }
     }
-  }
+}
 
-  &_failed {
-    &, &:hover {
-      border-color: $danger;
-      box-shadow: 0 0 1rem rgba($danger, .2);
+@keyframes rotate {
+    100% {
+        transform: rotate(360deg);
     }
-  }
-
-  &_loading &__label {
-    opacity: 0;
-  }
-
-  &__preloader {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-  }
-
-  &__badge {
-    position: relative;
-    top: -1px;
-    margin-left: 4px;
-  }
 }

package/form/CheckboxField/CheckboxFieldView.d.ts

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

package/form/CheckboxField/CheckboxFieldView.js

@@ -43,9 +43,9 @@ var useUniqueId_1 = __importDefault(require("@steroidsjs/core/hooks/useUniqueId"
 function CheckboxFieldView(props) {
     var bem = (0, hooks_1.useBem)('CheckboxFieldView');
     var id = (0, useUniqueId_1["default"])('checkbox');
-    return (React.createElement("div", { className: bem(bem.block({ 'is-invalid': !!props.errors }), 'custom-control', 'custom-checkbox') },
-        React.createElement("input", __assign({ className: bem(bem.element('input'), 'custom-control-input', !!props.errors && 'is-invalid', props.className), id: id }, props.inputProps, { disabled: props.disabled, required: props.required })),
-        React.createElement("label", { className: bem(bem.element('label'), 'custom-control-label'), htmlFor: id },
+    return (React.createElement("div", { className: "".concat(bem.block(), " \n                 ").concat(bem(props.className), "\n                 ").concat(props.errors ? 'has-errors' : ''), style: props.style, onClick: props.onChange },
+        React.createElement("input", __assign({ className: bem(bem.element('input')), id: id }, props.inputProps, { disabled: props.disabled, required: props.required })),
+        React.createElement("label", { className: bem(bem.element('label')), htmlFor: id },
             React.createElement("span", { className: bem.element('label-text', { required: props.required }) }, props.label))));
 }
 exports["default"] = CheckboxFieldView;

package/form/CheckboxField/CheckboxFieldView.scss

@@ -1,46 +1,131 @@
 .CheckboxFieldView {
-  display: inline-block;
+    $root: &;
 
-  &__label {
-    &-text {
-      &_required:after {
-        display: inline-block;
-        content: '*';
-        color: $danger;
-        margin: 0 0 0 3px;
-      }
-    }
-  }
-  .custom-control-label {
-    &::before, &::after {
-      top: 0;
+    display: inline-block;
+
+    font-family: $font-family-nunito;
+
+    &__input + &__label {
+        display: inline-flex;
+        align-items: center;
+        user-select: none;
     }
-  }
-
-  .custom-control-input {
-    &:checked ~ .custom-control-label {
-      &::before {
-        border-color: $primary;
-        background: $primary;
-      }
-      &:hover {
+
+    &__label {
+        position: relative;
+        cursor: pointer;
+
+        //Сам кастомный checkbox
         &::before {
-          background: $primary-dark;
+            content: "";
+            display: inline-block;
+            width: 24px;
+            height: 24px;
+            flex-shrink: 0;
+            flex-grow: 0;
+
+            border: 1px solid $gray;
+            border-radius: $radius-small;
+            margin-right: 8px;
+
+            background-repeat: no-repeat;
+            background-position: center center;
+            background-size: 50% 50%;
         }
-      }
-      &:active {
-        &::before {
-          background: $primary-light;
+
+        //Псевдоэлемент который служит для применения эффектов на чекбокс
+        &::after {
+            content: "";
+            display: inline-block;
+            position: absolute;
+            transform: translateX(-7.5%);
+
+            width: 28px;
+            height: 28px;
+            flex-shrink: 0;
+            flex-grow: 0;
+
+            border-radius: $radius-small;
+            border: 4px solid $primary-light;
+            opacity: 0;
+
+            background: transparent;
+        }
+
+        &-text {
+            color: $text-color;
+            font-size: $font-size-sm;
+            font-weight: $font-weight-md;
+            transform: translateY(1px);
         }
-      }
     }
-    &:disabled ~ .custom-control-label {
-      color: $border-default;
 
-      &::before {
-        border: unset;
-        background-color: $back-disabled;
-      }
+    &__input {
+        position: absolute;
+        z-index: -1;
+        opacity: 0;
+
+        //HOVER
+        &:not(:disabled):not(:checked):not(:active) + #{$root}__label:hover::before {
+            border-color: #d0d0d0;
+        }
+
+        //ACTIVE
+        &:not(:disabled):not(:checked):active + #{$root}__label::before {
+            border-color: $primary;
+        }
+
+        &:active:checked + #{$root}__label::after {
+            opacity: 0;
+        }
+
+        &:checked:active + #{$root}__label::before {
+            background-color: $primary-light;
+            border: none;
+        }
+
+        //FOCUS
+        &:focus + #{$root}__label::after {
+            opacity: 1;
+        }
+
+        //CHECKED
+        &:checked + #{$root}__label::before {
+            border-color: $primary;
+            background-color: $primary;
+            background-image: url("data:image/svg+xml,%3Csvg width='11' height='8' viewBox='0 0 11 8' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M9.20898 1L3.70898 7L1.20898 4.27273' stroke='white' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E%0A");
+        }
+
+        //DISABLED
+        &:disabled + #{$root}__label {
+            cursor: not-allowed;
+            color: $gray;
+
+            span {
+                color: currentColor;
+            }
+
+            &::before {
+                background: currentColor;
+                border: none;
+            }
+        }
+
+        &:disabled:checked #{$root}__label::before {
+            background-color: $gray;
+            border-color: none;
+            background-image: url("data:image/svg+xml,%3Csvg width='11' height='9' viewBox='0 0 11 9' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M9.8584 1.48401L4.3584 7.48401L1.8584 4.75674' stroke='black' stroke-opacity='0.1' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E%0A");
+        }
+
+        //ERROR
+    }
+}
+.has-errors label {
+    &::before {
+        border-color: $danger;
+    }
+
+    span {
+        color: $danger;
     }
-  }
 }

package/form/CheckboxListField/CheckboxListFieldView.d.ts

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

package/form/DateField/DateFieldView.d.ts

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

package/form/DateField/DateFieldView.js

@@ -39,7 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 var React = __importStar(require("react"));
 var react_1 = require("react");
-var Icon_1 = __importDefault(require("@steroidsjs/core/ui/icon/Icon"));
+var Icon_1 = __importDefault(require("@steroidsjs/core/ui/content/Icon"));
 var hooks_1 = require("@steroidsjs/core/hooks");
 var DropDown_1 = __importDefault(require("@steroidsjs/core/ui/content/DropDown"));
 var Calendar_1 = __importDefault(require("@steroidsjs/core/ui/content/Calendar"));

package/form/DateRangeField/DateRangeFieldView.d.ts

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

package/form/DateRangeField/DateRangeFieldView.js

@@ -40,7 +40,7 @@ exports.__esModule = true;
 var React = __importStar(require("react"));
 var react_1 = 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 DropDown_1 = __importDefault(require("@steroidsjs/core/ui/content/DropDown"));
 var Calendar_1 = __importDefault(require("@steroidsjs/core/ui/content/Calendar"));
 var isString_1 = __importDefault(require("lodash-es/isString"));

package/form/DateTimeField/DateTimeFieldView.d.ts

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

package/form/DateTimeField/DateTimeFieldView.js

@@ -40,7 +40,7 @@ exports.__esModule = true;
 var React = __importStar(require("react"));
 var hooks_1 = require("@steroidsjs/core/hooks");
 var react_1 = require("react");
-var Icon_1 = __importDefault(require("@steroidsjs/core/ui/icon/Icon"));
+var Icon_1 = __importDefault(require("@steroidsjs/core/ui/content/Icon"));
 var Calendar_1 = __importDefault(require("@steroidsjs/core/ui/content/Calendar"));
 var DropDown_1 = __importDefault(require("@steroidsjs/core/ui/content/DropDown"));
 var TimePanelView_1 = __importDefault(require("../TimeField/TimePanelView"));

package/form/DateTimeRangeField/DateTimeRangeFieldView.d.ts

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

package/form/DateTimeRangeField/DateTimeRangeFieldView.js

@@ -40,7 +40,7 @@ exports.__esModule = true;
 var React = __importStar(require("react"));
 var react_1 = 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 DropDown_1 = __importDefault(require("@steroidsjs/core/ui/content/DropDown"));
 var Calendar_1 = __importDefault(require("@steroidsjs/core/ui/content/Calendar"));
 var isString_1 = __importDefault(require("lodash-es/isString"));

package/form/DropDownField/DropDownFieldView.d.ts

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

package/form/DropDownField/DropDownFieldView.js

@@ -47,6 +47,7 @@ var React = __importStar(require("react"));
 var react_1 = require("react");
 var hooks_1 = require("@steroidsjs/core/hooks");
 function DropDownFieldView(props) {
+    var bem = (0, hooks_1.useBem)('DropDownFieldView');
     var inputRef = (0, react_1.useRef)(null);
     // Auto focus on search
     (0, react_1.useEffect)(function () {
@@ -70,7 +71,6 @@ function DropDownFieldView(props) {
                 props.onItemSelect(item[props.primaryKey]);
             }, onFocus: function () { return props.onItemHover(item[props.primaryKey]); }, onMouseOver: function () { return props.onItemHover(item[props.primaryKey]); } }, item.label));
     };
-    var bem = (0, hooks_1.useBem)('DropDownFieldView');
     return (React.createElement("div", { ref: props.forwardedRef, className: bem(bem.block({ size: props.size }), props.className), style: props.style },
         React.createElement("div", { className: bem.element('selected-items', {
                 reset: props.showReset,

package/form/DropDownField/DropDownFieldView.scss

@@ -1,3 +1,6 @@
+$text-muted: gray;
+$dropdown-divider-bg: transparent;
+
 .DropDownFieldView {
   $root: &;
 

package/form/FieldLayout/FieldLayoutView.d.ts

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

package/form/FieldList/FieldListView.d.ts

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

package/form/FieldSet/FieldSetView.d.ts

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

package/form/FileField/FileFieldItemView.d.ts

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

package/form/FileField/FileFieldItemView.js

@@ -28,7 +28,7 @@ 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"));
 function FileFieldItemView(props) {
     var bem = (0, hooks_1.useBem)('FileFieldItemView');
     return (React.createElement("div", { className: bem(bem.block(), 'card mb-1 mr-1', props.error && 'border-danger') },

package/form/FileField/FileFieldView.d.ts

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

package/form/FileField/FileFieldView.js

@@ -39,7 +39,7 @@ 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 Button_1 = __importDefault(require("@steroidsjs/core/ui/form/Button"));
 function FileFieldView(props) {
     var bem = (0, hooks_1.useBem)('FileFieldView');

package/form/HtmlField/HtmlFieldView.d.ts

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

package/form/ImageField/ImageFieldModalView.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { IImageFieldModalViewProps } from '@steroidsjs/core/ui/form/ImageField/ImageField';
 import 'react-image-crop/dist/ReactCrop.css';
 export default function ImageFieldModalView(props: IImageFieldModalViewProps): JSX.Element;

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;