@steroidsjs/bootstrap 3.0.0-beta.7 → 3.0.0-beta.71

package/list/Pagination/PaginationButtonView.scss

@@ -1,2 +1,264 @@
+:root {
+    --pagination-border-color: var(--gray);
+    --pagination-hover-background-color: $white;
+
+    --pagination-arrow-color: #323232;
+    --pagination-background-color-disabled: #F1F5F7;
+}
+
+html[data-theme="dark"] {
+    --pagination-border-color: var(--background-color);
+    --pagination-hover-background-color: var(--gray-dark);
+
+    --pagination-arrow-color: #ffffff;
+    --pagination-background-color-disabled: #333646;
+}
+
+$pagination-border-color: var(--pagination-border-color);
+$pagination-hover-background-color: var(--pagination-hover-background-color);
+
+$pagination-arrow-color: var(--pagination-arrow-color);
+$pagination-background-color-disabled: var(--pagination-background-color-disabled);
+
 .PaginationButtonView {
-}
+    $root: &;
+
+    display: flex;
+    flex-flow: row nowrap;
+    color: $text-color;
+
+    &_size {
+        &_lg {
+            height: 48px;
+            #{$root}__page {
+                &-button {
+                    padding: 12px 18px;
+                    font-size: $font-size-lg;
+                    line-height: 24px;
+
+                    &_hasIcon {
+                        padding: 12px;
+                    }
+                }
+
+                &_rounding-left {
+                    border-top-left-radius: 12px;
+                    border-bottom-left-radius: 12px;
+
+                    &::before {
+                        border-top-left-radius: 14px;
+                        border-bottom-left-radius: 14px;
+                    }
+                }
+
+                &_rounding-right {
+                    border-top-right-radius: 12px;
+                    border-bottom-right-radius: 12px;
+
+                    &::before {
+                        border-top-right-radius: 14px;
+                        border-bottom-right-radius: 14px;
+                    }
+                }
+
+                &::before {
+                    transform: translate(-4px, -4px);
+                }
+            }
+        }
+        &_md {
+            height: 40px;
+            #{$root}__page {
+                &-button {
+                    padding: 8px 14px;
+                    font-size: $font-size-base;
+                    line-height: 24px;
+
+                    &_hasIcon {
+                        padding: 8px 11px;
+                    }
+                }
+
+                &_rounding-left {
+                    border-top-left-radius: 12px;
+                    border-bottom-left-radius: 12px;
+
+                    &::before {
+                        border-top-left-radius: 14px;
+                        border-bottom-left-radius: 14px;
+                    }
+                }
+
+                &_rounding-right {
+                    border-top-right-radius: 12px;
+                    border-bottom-right-radius: 12px;
+
+                    &::before {
+                        border-top-right-radius: 14px;
+                        border-bottom-right-radius: 14px;
+                    }
+                }
+
+                &::before {
+                    transform: translate(-4px, -4px);
+                }
+            }
+        }
+        &_sm {
+            height: 32px;
+            #{$root}__page {
+                &-button {
+                    padding: 4px 12px;
+                    font-size: $font-size-sm;
+                    line-height: 25px;
+
+                    &_hasIcon {
+                        padding: 4px 7px;
+                    }
+                }
+
+                &_rounding-left {
+                    border-top-left-radius: 8px;
+                    border-bottom-left-radius: 8px;
+
+                    &::before {
+                        border-top-left-radius: 10px;
+                        border-bottom-left-radius: 10px;
+                    }
+                }
+
+                &_rounding-right {
+                    border-top-right-radius: 8px;
+                    border-bottom-right-radius: 8px;
+
+                    &::before {
+                        border-top-right-radius: 10px;
+                        border-bottom-right-radius: 10px;
+                    }
+                }
+
+                &::before {
+                    transform: translate(-4px, -4px);
+                }
+            }
+        }
+    }
+
+    &__page {
+        position: relative;
+        $pageRoot: &;
+
+        display: inline-block;
+        cursor: pointer;
+
+        background-color: $element-background-color;
+        border: 1px solid $pagination-border-color;
+        border-right: none;
+
+        &::before {
+            position: absolute;
+            z-index: 2;
+            content: "";
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            pointer-events: none;
+            border-radius: inherit;
+            border: 4px solid $light-gray;
+            opacity: 0;
+        }
+
+        &:last-child {
+            border: 1px solid $pagination-border-color;
+        }
+
+        &_active {
+            background-color: $primary;
+            color: $white;
+        }
+
+        &_hasIcon:not(#{$pageRoot}_disabled):active {
+            background-color: $primary;
+
+            #{$pageRoot}-icon {
+                path {
+                    stroke: #ffffff;
+                }
+            }
+        }
+
+        &:not(#{$pageRoot}_disabled):not(#{$pageRoot}_active):hover {
+            border-color: $element-border-color-hover;
+            background-color: $pagination-hover-background-color;
+        }
+
+        &:not(#{$pageRoot}_disabled):focus-within::before {
+            opacity: 1;
+        }
+
+        &_rounding {
+            &-left {
+                border-top-left-radius: 10px;
+                border-bottom-left-radius: 10px;
+            }
+
+            &-right {
+                border-top-right-radius: 10px;
+                border-bottom-right-radius: 10px;
+            }
+        }
+
+        &-button {
+            cursor: pointer;
+            width: 100%;
+            height: 100%;
+            border: none;
+            background: none;
+            color: inherit;
+            user-select: none;
+            outline: none;
+        }
+
+        &-icon {
+            display: inline-block;
+            width: 24px;
+            height: 24px;
+            pointer-events: none;
+
+            display: flex;
+            justify-content: center;
+            align-items: center;
+
+            rect {
+                fill: transparent;
+            }
+
+            path {
+                stroke: $pagination-arrow-color;
+            }
+
+            &_rotate {
+                transform: rotate(180deg);
+            }
+        }
+
+        &_disabled {
+            background-color: $element-background-color-disabled;
+            color: $element-placeholder-color-disabled;
+
+            cursor: not-allowed;
+
+            button {
+                cursor: not-allowed;
+            }
+
+            #{$pageRoot}-icon {
+                pointer-events: none;
+                path {
+                    stroke: $element-placeholder-color-disabled;
+                }
+            }
+        }
+    }
+}

package/list/Pagination/PaginationMoreView.js

@@ -42,7 +42,7 @@ var Button_1 = __importDefault(require("@steroidsjs/core/ui/form/Button"));
 var hooks_1 = require("@steroidsjs/core/hooks");
 function PaginationMoreView(props) {
     var bem = (0, hooks_1.useBem)('PaginationMoreView');
-    return (React.createElement("div", { className: bem('text-center', bem.block(), props.className) },
+    return (React.createElement("div", { className: bem(bem.block(), props.className) },
         React.createElement(Button_1["default"], __assign({ color: 'secondary', outline: true, label: __('Загрузить еще...') }, props.buttonProps, { onClick: props.onSelectNext }))));
 }
 exports["default"] = PaginationMoreView;

package/list/Pagination/PaginationMoreView.scss

@@ -1,2 +1,5 @@
 .PaginationMoreView {
-}
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}

package/list/PaginationSize/PaginationSizeView.js

@@ -22,16 +22,16 @@ 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;
 var React = __importStar(require("react"));
 var hooks_1 = require("@steroidsjs/core/hooks");
+var ButtonGroup_1 = __importDefault(require("@steroidsjs/core/ui/nav/ButtonGroup"));
 function PaginationSizeView(props) {
     var bem = (0, hooks_1.useBem)('PaginationSizeView');
     return (React.createElement("div", { className: bem(props.className, bem.block()) },
-        React.createElement("ul", { className: bem(bem.element('sizes'), 'pagination', "pagination-".concat(props.size)) }, props.items.map(function (item, index) { return (React.createElement("li", { key: index, className: bem(bem.element('sizes-item', { active: item.isActive }), 'page-item', item.isActive && 'active') },
-            React.createElement("button", { className: bem(bem.element('link'), 'page-link'), onClick: function (e) {
-                    e.preventDefault();
-                    props.onSelect(item.size);
-                } }, item.label))); }))));
+        React.createElement(ButtonGroup_1["default"], { items: props.items, onClick: props.onSelect, activeButton: props.defaultValue, buttonProps: props.buttonProps })));
 }
 exports["default"] = PaginationSizeView;

package/list/PaginationSize/PaginationSizeView.scss

@@ -2,12 +2,4 @@
   display: flex;
   align-items: center;
   justify-content: flex-end;
-
-  &__label {
-    margin-right: 5px;
-  }
-
-  &__sizes {
-    margin-bottom: 0;
-  }
 }

package/modal/Modal/ModalView.d.ts

@@ -1,3 +1,2 @@
-import { IBemHocOutput } from '@steroidsjs/core/hoc/bem';
 import { IModalViewProps } from '@steroidsjs/core/ui/modal/Modal/Modal';
-export default function ModalView(props: IModalViewProps & IBemHocOutput): JSX.Element;
+export default function ModalView(props: IModalViewProps): JSX.Element;

package/modal/Modal/ModalView.js

@@ -40,7 +40,8 @@ exports.__esModule = true;
 var React = __importStar(require("react"));
 var react_modal_1 = __importDefault(require("react-modal"));
 var hooks_1 = require("@steroidsjs/core/hooks");
-var Controls_1 = __importDefault(require("@steroidsjs/core/ui/nav/Controls"));
+var content_1 = require("@steroidsjs/core/ui/content");
+var form_1 = require("@steroidsjs/core/ui/form");
 function ModalView(props) {
     var bem = (0, hooks_1.useBem)('ModalView');
     var overrideDefaultClasses = {
@@ -48,15 +49,11 @@ function ModalView(props) {
         afterOpen: 'ModalView_overlay-after',
         beforeClose: 'ModalView_overlay-before'
     };
-    return (React.createElement(react_modal_1["default"], __assign({}, props, { ariaHideApp: false, bodyOpenClassName: 'ModalView_body-hide-scroll', className: bem.element('body', { size: props.size }), closeTimeoutMS: props.closeTimeoutMs, isOpen: !props.isClosing, onRequestClose: props.onClose, overlayClassName: overrideDefaultClasses, shouldCloseOnEsc: props.shouldCloseOnEsc, shouldCloseOnOverlayClick: props.shouldCloseOnOverlayClick }),
+    return (React.createElement(react_modal_1["default"], __assign({}, props, { ariaHideApp: false, bodyOpenClassName: 'ModalView_body-hide-scroll', className: bem(bem.element('body', { size: props.size }), props.className), closeTimeoutMS: props.closeTimeoutMs, isOpen: !props.isClosing, onRequestClose: props.onClose, overlayClassName: overrideDefaultClasses, shouldCloseOnEsc: props.shouldCloseOnEsc, shouldCloseOnOverlayClick: props.shouldCloseOnOverlayClick }),
         React.createElement("div", { className: bem.element('header') },
             React.createElement("span", { className: bem.element('title') }, props.title),
-            React.createElement("button", { className: bem.element('close'), onClick: function (e) {
-                    e.preventDefault();
-                    props.onClose();
-                }, "aria-label": __('Закрыть') })),
+            React.createElement(content_1.Icon, { name: 'cross_12x12', className: bem.element('close'), onClick: props.onClose })),
         React.createElement("div", { className: bem.element('content') }, props.children),
-        props.controls && (React.createElement("div", { className: bem.element('footer') },
-            React.createElement(Controls_1["default"], { className: bem.element('controls'), items: props.controls })))));
+        props.buttons && (React.createElement("div", { className: bem.element('footer') }, props.buttons.map(function (button, buttonIndex) { return (React.createElement(form_1.Button, __assign({ key: buttonIndex, size: props.size }, button))); })))));
 }
 exports["default"] = ModalView;

package/modal/Modal/ModalView.scss

@@ -1,108 +1,153 @@
+:root { 
+    --modal-background-color:  #FFFFFF;
+}
+
+html[data-theme="dark"] {
+    --modal-background-color:  #272A37;
+}
+
+$modal-background-color: var(--modal-background-color);
+
 .ModalView {
+    $root: &;
+    min-width: 300px;
+
+    &_overlay {
+        position: fixed;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+
+        display: flex;
+        padding: 50px;
+
+        background-color: rgba(0, 0, 0, 0.7);
+    }
+
+    &__body {
+        margin: auto;
+        overflow: visible;
+        background-color: $modal-background-color;
+        color: $text-color;
+        box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1);
+
+        &_size {
+            &_lg {
+                border-radius: 16px;
+
+                font-size: $font-size-lg;
+                line-height: $line-height-lg;
+
+                #{$root}__header {
+                    padding: 24px;
+                }
+
+                #{$root}__content {
+                    padding: 24px;
+                }
+
+                #{$root}__footer { 
+                    padding: 24px;
+                }
+            }
+            &_md {
+                border-radius: $radius-large;
+
+                font-size: $font-size-base;
+                line-height: $line-height-base;
+
+                #{$root}__header {
+                    padding: 21px 20px;
+                }
+
+                #{$root}__content {
+                    padding: 20px;
+                }
+
+                #{$root}__footer { 
+                    padding: 20px;
+                }
+            }
+            &_sm {
+                border-radius: $radius-small;
+
+                font-size: $font-size-sm;
+                line-height: $line-height-sm;
+
+                #{$root}__header {
+                    padding: 19px 16px;
+                }
+
+                #{$root}__content {
+                    padding: 16px;
+                }
+
+                #{$root}__footer { 
+                    padding: 16px;
+                }
+            }
+        }
+    }
+
+    &__header {
+        display: flex;
+        flex-flow: row nowrap;
+        align-items: center;
+        justify-content: space-between;
+
+        > * {
+            display: inline-block;
+        }
+    }
+
+    &__title {
+        font-size: inherit;
+        line-height: inherit;
+        font-weight: $font-weight-lg;
+    }
+
+    &__close {
+        cursor: pointer;
+        width: 24px;
+        height: 24px;
 
-  &_overlay {
-    z-index: 100;
-    position: fixed;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-
-    display: flex;
-    padding: 50px;
-
-    background-color: rgba(0,0,0,0.7);
-  }
-
-  &__body {
-    margin: auto;
-    background: #fff;
-
-    &_size {
-      &_small {
-        width: 400px;
-      }
-      &_middle {
-        width: 600px;
-      }
-      &_large {
-        width: 960px;
-      }
+        svg {
+            path {
+                stroke: $text-color;
+            }
+        }
     }
-  }
-
-  &__header {
-    position: relative;
-    padding: 15px;
-
-    color: #333;
-    font-size: 20px;
-    border-bottom: 1px solid #f0f0f0;
-  }
-  &__close {
-    position: absolute;
-    top: 0;
-    right: 0;
-    width: 50px;
-    height: 50px;
-
-    &:hover::before,
-    &:hover::after {
-      background-color: #333;
+
+    &__content {
+        font-size: inherit;
+        line-height: inherit;
+    }
+
+    &__footer {
+        display: flex;
+        flex-flow: row wrap;
+        justify-content: center;
+        align-items: center;
+        column-gap: 8px;
     }
 
-    &::before,
-    &::after
-    {
-      content: '';
-      display: block;
-      position: absolute;
-      top: 50%;
-      margin-top: -8px;
-      left: 50%;
-      width: 1px;
-      height: 16px;
-      background-color: #888;
+    // Fade animation
+    &_overlay {
+        opacity: 0;
+        transition: opacity 0.3s ease-in-out;
     }
 
-    &::before {
-      transform: rotate(45deg);
+    &_overlay-after {
+        opacity: 1;
     }
 
-    &::after {
-      transform: rotate(-45deg);
+    &_overlay-before {
+        opacity: 0;
     }
-  }
-
-  &__content {
-    padding: 15px;
-  }
-
-  &__footer {
-    padding: 15px;
-    border-top: 1px solid #f0f0f0;
-  }
-  &__controls.ControlsView {
-    flex-direction: row-reverse;
-  }
-
-  // Fade animation
-
-  &_overlay {
-    opacity: 0;
-    transition: opacity .3s ease-in-out;
-  }
-
-  &_overlay-after {
-    opacity: 1;
-  }
-
-  &_overlay-before {
-    opacity: 0;
-  }
 }
 
 // Class to hide body scroll, when Modal is opened
 .ModalView_body-hide-scroll {
-  overflow: hidden;
+    overflow: hidden;
 }

package/modal/TwoFactorModal/TwoFactorModalView.d.ts

@@ -1,4 +1,3 @@
-import { IBemHocOutput } from '@steroidsjs/core/hoc/bem';
 import { ITwoFactorModalViewProps } from '@steroidsjs/core/ui/modal/TwoFactorModal/TwoFactorModal';
 import './TwoFactorModalView.scss';
-export default function TwoFactorModalView(props: ITwoFactorModalViewProps & IBemHocOutput): JSX.Element;
+export default function TwoFactorModalView(props: ITwoFactorModalViewProps): JSX.Element;

package/nav/Breadcrubms/BreadcrumbsView.js

@@ -29,14 +29,22 @@ exports.__esModule = true;
 var React = __importStar(require("react"));
 var Link_1 = __importDefault(require("@steroidsjs/core/ui/nav/Link"));
 var hooks_1 = require("@steroidsjs/core/hooks");
+var content_1 = require("@steroidsjs/core/ui/content");
+var renderIcon_1 = __importDefault(require("../../utils/renderIcon"));
 function BreadcrumbsView(props) {
     var bem = (0, hooks_1.useBem)('BreadcrumbsView');
     var items = props.items || [];
+    var renderLink = React.useCallback(function (item, children) { return (React.createElement(Link_1["default"], { toRoute: item.id, toRouteParams: props.routeParams, href: item.id }, children)); }, [props.routeParams]);
+    var renderHomeIcon = React.useCallback(function () { return (props.customIcon
+        ? (0, renderIcon_1["default"])(props.customIcon, { className: bem.element('custom-icon') })
+        : (React.createElement(content_1.Icon, { name: 'home', className: bem.element('icon') }))); }, [bem, props.customIcon]);
     return (React.createElement("nav", { className: bem(bem.block(), props.className), "aria-label": 'breadcrumb' },
         React.createElement("ol", { className: bem.element('list') }, items.map(function (item, index) {
             var isLastItem = items.length === index + 1;
+            var isFirstItem = index === 0;
             return (React.createElement("li", { key: item.id || index, className: bem.element('item') },
-                !isLastItem && item.id && (React.createElement(Link_1["default"], { toRoute: item.id, toRouteParams: props.routeParams, href: item.id }, item.title)),
+                isFirstItem && item.id && renderLink(item, props.showIcon ? renderHomeIcon() : item.title),
+                !isFirstItem && !isLastItem && item.id && renderLink(item, item.title),
                 (isLastItem || !item.id) && (React.createElement("span", null, props.pageTitle || item.title))));
         }))));
 }

package/nav/Breadcrubms/BreadcrumbsView.scss

@@ -1,6 +1,36 @@
+
+
+:root {
+  --last-link-color: rgba(0, 0, 0, 0.3);;
+}
+
+html[data-theme="dark"] { 
+  --last-link-color: rgba(255, 255, 255, 0.3);
+}
+
+$last-link-color: var(--last-link-color);
+
 .BreadcrumbsView {
   $breadcrumb-item-separator: '/';
 
+
+
+  &__icon, &__custom-icon {
+    display: flex;
+
+    svg {
+      stroke: $link-color;
+    }
+
+    svg:hover { 
+      stroke: $link-color-hover;
+    }
+
+    svg path, svg circle {
+      stroke:inherit;
+    }
+  }
+
   &__list {
     display: flex;
     flex-wrap: wrap;
@@ -8,11 +38,30 @@
     padding: 0;
   }
 
+  &__list {
+    li:last-child span{
+      color: $last-link-color;
+    }
+  }
+
   &__item {
+    display: flex;
+    align-items: center;
+
     &:not(:first-child)::before {
       content: $breadcrumb-item-separator;
       display: inline-block;
       margin: 0 8px;
+      color: $link-color;
+    }
+
+    span {
+      line-height: 24px;
+      font-size: 14px;
+    }
+
+    span:hover {
+      color: $link-color-hover;
     }
   }
 }