@steroidsjs/bootstrap 3.0.0-beta.12 → 3.0.0-beta.120

package/form/FieldList/FieldListView.scss

@@ -1,35 +1,88 @@
+
+@use "../../scss/variables";
+
+:root {
+    --background-th: var(--light-gray);
+    --background-td-alternating: var(--additional-light-gray);
+}
+
+html[data-theme="dark"] {
+    --background-th: var(--additional-gray-dark);
+    --background-td-alternating: var(--graphite-dark);
+}
+
+$background-th: var(--background-th);
+$background-td-alternating: var(--background-td-alternating);
+
 .FieldListView {
+    overflow-x: auto;
+    table {
+        width: 100%;
+        background-color: transparent;
+        border: 1px solid variables.$gray-dark;
+        border-collapse: separate;
+        border-radius: 10px;
+        border-spacing: 0;
+        overflow: hidden;
+    }
+
+    th:not(:last-child),
+    td:not(:last-child) {
+        border-right: 1px solid variables.$gray-dark;
+    }
+
+    tr th {
+        border-bottom: 1px solid variables.$gray-dark;
+        background-color: $background-th;
+        color: variables.$text-color;
+        font-size: 14px;
+        line-height: 18px;
+    }
 
-  &__table {
-    th, thead th, td {
-      border: none;
+    tr:not(:last-child) td {
+        border-bottom: 1px solid variables.$gray-dark;
     }
-  }
 
-  &__table-cell {
-    .form-group {
-      margin-bottom: 0;
+    tfoot > tr > td {
+        border-top: 1px solid variables.$gray-dark;
     }
 
-    &_remove {
-      vertical-align: middle !important;
+    tr td {
+        padding: 12px;
     }
-  }
 
-  &__table-cell-header {
-    padding-bottom: 0 !important;
-  }
+    tr th {
+        text-align: left;
+        padding: 20px 12px;
+    }
 
-  &__remove {
-    cursor: pointer;
-    color: $danger;
-  }
+    tr td .CheckboxFieldView {
+        justify-content: center;
+    }
 
-  &__button-add {
-    margin-left: 0.75rem;
-  }
+    td {
+        background: variables.$element-background-color;
+        overflow: hidden;
+    }
 
-  .FileFieldView__files {
-    margin-bottom: 0;
-  }
-}
+    &_hasAlternatingColors {
+        tr:nth-child(even) td {
+            background-color: $background-td-alternating;
+        }
+    }
+
+    &__button-add {
+        svg {
+            path {
+                stroke: variables.$primary;
+            }
+        }
+        > span {
+            gap: 4px;
+        }
+    }
+
+    .FieldLayoutView {
+        margin-bottom: 0;
+    }
+}

package/form/FieldSet/FieldSetView.js

@@ -24,9 +24,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 exports.__esModule = true;
 var React = __importStar(require("react"));
+var hooks_1 = require("@steroidsjs/core/hooks");
 function FieldSetView(props) {
-    return (React.createElement("fieldset", { className: props.className },
-        React.createElement("legend", null, props.label),
+    var bem = (0, hooks_1.useBem)('FieldSetView');
+    return (React.createElement("fieldset", { className: bem(bem.block(), props.className) },
+        React.createElement("legend", { className: bem.element('legend') }, props.label),
         props.children));
 }
 exports["default"] = FieldSetView;

package/form/FieldSet/FieldSetView.scss

@@ -0,0 +1,42 @@
+
+@use "../../scss/variables";
+
+:root {
+    --legend-color: #152536;
+    --fieldset-border-color: #E6E6E6;
+}
+  
+html[data-theme="dark"] { 
+    --legend-color: #ffffff;
+    --fieldset-border-color: #595959;
+}
+  
+$legend-color: var(--legend-color);
+$fieldset-border-color: var(--fieldset-border-color);
+
+.FieldSetView{
+    border: 1px solid $fieldset-border-color;
+    border-radius: 8px;
+
+    &__legend {
+        background-color: variables.$background-color;
+        color: $legend-color;
+
+        padding: 8px;
+        margin-left: 16px;
+
+        line-height: 32px;
+        font-weight: 700;
+        font-size: 24px;
+
+    }
+
+    .FieldLayoutView {
+        padding: 0px 24px 24px 24px;
+        margin-bottom: 0px;
+    }
+
+    .FieldLayoutView + .FieldLayoutView {
+        padding-top: 0px;
+    }
+}

package/form/FileField/FileFieldItemView.d.ts

@@ -1,3 +1,2 @@
-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;
+export default function FileFieldItemView(props: IFileFieldItemViewProps): JSX.Element;

package/form/FileField/FileFieldItemView.js

@@ -28,15 +28,40 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 var React = __importStar(require("react"));
 var hooks_1 = require("@steroidsjs/core/hooks");
+var FileField_1 = require("@steroidsjs/core/ui/form/FileField/FileField");
 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') },
+    var isLoading = props.progress && props.progress.percent !== 100;
+    var isWall = props.filesLayout === FileField_1.FilesLayout.wall;
+    var renderLink = React.useCallback(function () { return (React.createElement("a", { className: bem.element('link'), title: props.title, href: props.error ? '#' : props.item.url, target: 'blank' }, isWall
+        ? React.createElement(Icon_1["default"], { name: 'view' })
+        : props.title)); }, [bem, props.title, props.error, props.item.url, isWall]);
+    var renderProgressBar = React.useCallback(function () { return (React.createElement("div", { className: bem.element('progress-track') },
+        React.createElement("div", { className: bem.element('progress-bar'), style: { width: "".concat(props.progress.percent, "%") } }))); }, [bem, props.progress]);
+    var renderLoadingState = React.useCallback(function () { return (React.createElement("div", { className: bem.element('left') },
+        React.createElement("div", { className: bem.element('icon-wrapper', 'loading') },
+            React.createElement(Icon_1["default"], { className: bem.element('icon-loading'), name: 'loading_default' })),
+        React.createElement("div", { className: bem.element('content') },
+            React.createElement("span", { className: bem.element('title', 'loading') }, props.title),
+            renderProgressBar(),
+            React.createElement("span", { className: bem.element('loading-text') }, __('Uploading...'))))); }, [bem, props.title, renderProgressBar]);
+    var renderFileItem = React.useCallback(function () { return (React.createElement("div", { className: bem.element('left') },
         props.image
-            ? (React.createElement("img", { src: props.image.url, className: 'card-img-top', width: props.image.width, height: props.image.height, alt: props.title }))
-            : (React.createElement(Icon_1["default"], { className: bem.element('blank-img'), name: props.imagesOnly ? 'file-image' : 'file' })),
-        props.showRemove && (React.createElement(Icon_1["default"], { onClick: props.onRemove, className: bem.element('remove'), name: 'times' })),
-        React.createElement("div", { className: 'card-body' },
-            React.createElement("p", { className: bem(bem.element('text'), 'card-text text-center', props.error && 'text-danger'), title: props.error || props.title }, props.error || props.title))));
+            ? (React.createElement("div", { className: bem.element('image'), style: { backgroundImage: "url(".concat(props.image.url, ")") } }))
+            : (React.createElement("div", { className: bem.element('icon-wrapper') },
+                React.createElement(Icon_1["default"], { className: bem.element('icon'), name: props.imagesOnly ? 'img_box' : 'clip' }))),
+        renderLink(),
+        React.createElement("span", { className: bem.element('title') }, props.title))); }, [bem, props.image, props.imagesOnly, props.title, renderLink]);
+    return (React.createElement("div", { className: bem.block({
+            error: !!props.error,
+            images: props.imagesOnly,
+            isWall: isWall
+        }) },
+        isLoading
+            ? renderLoadingState()
+            : renderFileItem(),
+        props.showRemove && (React.createElement(Icon_1["default"], { name: props.customRemoveIcon || 'trash', className: bem.element('remove', { isLoading: isLoading }), onClick: props.onRemove })),
+        React.createElement("div", { className: bem.element('overlay') })));
 }
 exports["default"] = FileFieldItemView;

package/form/FileField/FileFieldItemView.scss

@@ -1,33 +1,278 @@
+@use "../../scss/variables";
+@use '../../scss/mixins';
+@use '../../scss/animations' as anim;
+
+$small-image-size: 48px;
+$image-border-radius: 8px;
+
+@mixin fullSize {
+  width: 100%;
+  height: 100%;
+}
+
+@mixin textEllipsis {
+  max-width: 100%;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
 .FileFieldItemView {
-  width: 200px;
-  font-size: $font-size-sm;
+  $root: &;
 
-  &:hover &__remove {
-    display: block;
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  column-gap: 8px;
+  padding: 12px 30px 12px 12px;
+  width: 100%;
+  font-size: variables.$font-size-sm;
+
+  &_images {
+    padding: 8px;
+    border: 1px solid variables.$gray;
+    border-radius: 12px;
+
+    #{$root}__icon-wrapper {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: $small-image-size;
+      height: $small-image-size;
+      border-radius: $image-border-radius;
+      background-color: variables.$light-gray;
+    }
   }
 
-  &__blank-img {
-    text-align: center;
-    padding: 35px 0 15px;
+  &__overlay {
+    display: none;
+  }
+
+  &_isWall {
+    padding: 5px;
+    width: 128px;
+    height: 128px;
+    border: 1px solid variables.$gray;
+    border-radius: 20px;
+
+    #{$root}__title {
+      display: block;
+      text-align: center;
+
+      &_loading {
+        display: none;
+      }
+    }
+
+    #{$root}__overlay {
+      display: block;
+      position: absolute;
+      top: 0;
+      right: 0;
+      left: 0;
+      bottom: 0;
+      z-index: 3;
+      background-color: #000;
+      opacity: 0;
+      border-radius: 20px;
+    }
+
+    &:hover {
+      #{$root}__overlay {
+        opacity: 0.8;
+      }
+
+      #{$root}__link {
+        opacity: 1;
+      }
+    }
+
+    &#{$root}_images {
+      #{$root}__title {
+        display: none;
+      }
+
+      #{$root}__overlay {
+        top: 5px;
+        right: 5px;
+        left: 5px;
+        bottom: 5px;
+        border-radius: 16px;
+      }
+    }
+
+    #{$root}__link {
+      @include mixins.svg-color(variables.$white);
+      position: absolute;
+      top: 52px;
+      left: 70px;
+      z-index: 4;
+      opacity: 0;
+
+      circle {
+        stroke: variables.$white;
+      }
+    }
+
+    #{$root}__left {
+      @include fullSize;
+      flex-direction: column;
+      justify-content: center;
+    }
+
+    #{$root}__image {
+      @include fullSize;
+      border-radius: 16px;
+    }
+
+    #{$root}__remove {
+      @include mixins.svg-color(variables.$white);
+      position: absolute;
+      left: 30px;
+      z-index: 4;
+
+      &_isLoading {
+        left: 50px;
+      }
+    }
+
+    #{$root}__icon-wrapper_loading {
+      display: none;
+    }
+
+    #{$root}__loading-text {
+      display: block;
+      margin-top: 16px;
+      text-align: center;
+    }
+
+    #{$root}__progress-track {
+      width: 40px;
+    }
+
+    #{$root}__content {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+
+    &#{$root}_error {
+      background-color: variables.$light-gray;
+    }
+
+    &#{$root}_error {
+      #{$root}__title {
+        display: block;
+      }
+    }
+  }
+
+  &__image {
+    width: $small-image-size;
+    height: $small-image-size;
+    background-size: cover;
+    background-repeat: no-repeat;
+    background-position: center;
+    border-radius: $image-border-radius;
+  }
+
+  &__left {
+    display: flex;
+    align-items: center;
+    column-gap: 8px;
     width: 100%;
+  }
+
+  &__link {
+    @include textEllipsis;
+    color: variables.$link-color;
+
+    &:hover {
+      color: variables.$link-color-hover;
+      text-decoration: none;
+    }
+  }
+
+  &__title {
+    @include textEllipsis;
+    display: none;
+
+    &_loading {
+      display: block;
+    }
+  }
+
+  &_error {
+    @include mixins.svg-color(variables.$danger);
+
+    #{$root}__icon {
+      circle {
+        fill: variables.$danger;
+      }
+    }
+
+    #{$root}__title {
+      color: variables.$danger;
+    }
 
-    &.IconView svg {
-      width: 32px;
+    a,
+    a:hover {
+      color: variables.$danger;
+      cursor: default;
+      pointer-events: none;
     }
   }
 
+  &__icon {
+    height: 25px;
+  }
+
+  &:hover &__remove {
+    opacity: 1;
+  }
+
   &__text {
     max-height: 80px;
     overflow: hidden;
   }
 
   &__remove {
-    position: absolute;
-    top: 0;
-    righT: 0;
-    display: none;
+    opacity: 0;
     cursor: pointer;
-    padding: 10px;
     z-index: 3;
+    height: 25px;
+
+    svg {
+      width: 25px;
+      height: 25px;
+    }
+  }
+
+  &__icon-loading {
+    @include anim.loadingAnimation;
+    display: block;
+    width: 24px;
+    height: 24px;
+  }
+
+  &__loading-text {
+    display: none;
+  }
+
+  &__content {
+    width: 100%;
+  }
+
+  &__progress-track {
+    margin-top: 4px;
+    height: 4px;
+    background-color: variables.$gray;
+    border-radius: 4px;
+  }
+
+  &__progress-bar {
+    height: inherit;
+    background-color: variables.$primary;
+    border-radius: 4px;
   }
 }

package/form/FileField/FileFieldView.d.ts

@@ -1,3 +1,2 @@
-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;
+export default function FileFieldView(props: IFileFieldViewProps): JSX.Element;

package/form/FileField/FileFieldView.js

@@ -39,17 +39,15 @@ 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/content/Icon"));
+var FileField_1 = require("@steroidsjs/core/ui/form/FileField/FileField");
 var Button_1 = __importDefault(require("@steroidsjs/core/ui/form/Button"));
 function FileFieldView(props) {
     var bem = (0, hooks_1.useBem)('FileFieldView');
-    var ButtonComponent = props.buttonComponent || Button_1["default"];
+    var ButtonView = props.buttonView || Button_1["default"];
     var FileItemView = props.itemView;
-    return (React.createElement("div", { className: bem.block() },
-        React.createElement("div", { className: bem(bem.element('files')) }, props.items.map(function (item) { return (React.createElement(FileItemView, __assign({ key: item.uid }, item, props.itemProps))); })),
-        React.createElement("div", { className: bem.element('button') },
-            React.createElement(ButtonComponent, __assign({}, props.buttonProps, { layout: false, label: null }),
-                React.createElement(Icon_1["default"], { className: bem.element('button-icon'), name: props.imagesOnly ? 'file-image' : 'upload' }),
-                React.createElement("span", { className: bem.element('button-label') }, props.buttonProps.label)))));
+    var isWall = props.filesLayout === FileField_1.FilesLayout.wall;
+    return (React.createElement("div", { className: bem(bem.block({ isWall: isWall }), props.className) },
+        React.createElement(ButtonView, __assign({ className: bem.element('button', { isWall: isWall }), icon: isWall ? 'add' : 'import' }, props.buttonProps)),
+        React.createElement("div", { className: bem(bem.element('files')) }, props.items.map(function (item) { return (React.createElement(FileItemView, __assign({ key: item.uid, filesLayout: props.filesLayout, imagesOnly: props.imagesOnly, customRemoveIcon: props.customRemoveIcon }, item, props.itemProps))); }))));
 }
 exports["default"] = FileFieldView;

package/form/FileField/FileFieldView.scss

@@ -1,15 +1,48 @@
+@use "../../scss/variables";
+
 .FileFieldView {
-  &__files {
-    margin-bottom: 1em;
-    display: flex;
-    flex-wrap: wrap;
-  }
-
-  &__button-label {
-    vertical-align: middle;
-  }
-
-  &__button-icon {
-    margin-right: 5px;
-  }
+    $root: &;
+    width: 100%;
+
+    &__files {
+        margin-bottom: 1em;
+        display: flex;
+        row-gap: 8px;
+        flex-wrap: wrap;
+        flex-direction: column;
+    }
+
+    &_isWall {
+        display: flex;
+        column-gap: 10px;
+
+        #{$root}__files {
+            flex-direction: row;
+            column-gap: 10px;
+        }
+    }
+
+    &__button {
+        margin-bottom: 16px;
+        min-width: 200px;
+
+        &_isWall {
+            min-width: 128px;
+            width: 128px;
+            height: 128px;
+            border: 1px dashed #6F6B76;
+            background-color: variables.$gray;
+            border-radius: 20px;
+
+            .ButtonView__label {
+                flex-direction: column;
+                row-gap: 10px;
+            }
+        }
+    }
+
+    .ButtonView__icon {
+        width: 25px;
+        height: 25px;
+    }
 }

package/form/Form/FormView.js

@@ -58,10 +58,7 @@ function FormView(props) {
             }, 10);
         }
     });
-    return (React.createElement("form", { ref: formRef, className: bem(bem.block({
-            border: props.isBordered,
-            inline: props.layout.layout === 'inline'
-        }), props.className, props.layout.layout === 'horizontal' && 'form-horizontal'), onSubmit: props.onSubmit, style: props.style },
+    return (React.createElement("form", { ref: formRef, className: bem(bem.block(), props.className), onSubmit: props.onSubmit, style: props.style },
         props.children,
         (props.fields || []).map(function (field, index) { return (React.createElement(Field_1["default"], __assign({ key: index }, ((0, isString_1["default"])(field) ? { attribute: field } : field)))); }),
         props.submitLabel && (React.createElement(Button_1["default"], { type: 'submit', label: props.submitLabel }))));

package/form/Form/FormView.scss

@@ -1,17 +1,4 @@
 .FormView {
-  &_border {
-    padding: 20px;
-    border: 1px solid $border-default;
-    box-sizing: border-box;
-    box-shadow: $shadow-default;
-    border-radius: 0.5rem;
-  }
-  &_inline {
     display: flex;
-    grid-gap: 20px;
-    align-items: flex-start;
-  }
-  .form-control {
-    display: flex;
-  }
+    flex-flow: column nowrap;
 }

package/form/HtmlField/HtmlFieldView.d.ts

@@ -1,3 +1,2 @@
-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;
+export default function HtmlFieldView(props: IHtmlFieldViewProps): JSX.Element;

package/form/HtmlField/HtmlFieldView.scss

@@ -1,4 +1,10 @@
-
 .HtmlFieldView {
+    --ck-color-toolbar-background: #f1f5f7;
+    --ck-color-toolbar-border: #dbe2e6;
+    --ck-color-base-border: #dbe2e6;
+    --ck-border-radius: 12px;
 
+    .ck .ck-toolbar__items { 
+        flex-wrap: wrap !important;
+    }
 }

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;