@steroidsjs/bootstrap 3.0.0-beta.65 → 3.0.0-beta.67

package/content/Alert/AlertView.scss

@@ -108,7 +108,7 @@ $alert-themes: map-merge(
     }
 
     &__wrapper {
-        width: 508px;
+        max-width: 508px;
         display: flex;
         flex-flow: column;
         justify-content: space-between;

package/form/Button/ButtonView.scss

@@ -114,6 +114,16 @@ $btn-letter-spacing: 0.1em;
     &__link { 
         display: inline-flex;
         align-items: center;
+
+        #{$root}__text {
+            color: $link-color;
+        }
+
+        &:hover { 
+            #{$root}__text { 
+                color: $link-color-hover;
+            }
+        }
     }
 
     &__icon {

package/layout/Notifications/NotificationsItemView.js

@@ -22,11 +22,15 @@ 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 react_1 = require("react");
 var react_transition_group_1 = require("react-transition-group");
 var hooks_1 = require("@steroidsjs/core/hooks");
+var AlertView_1 = __importDefault(require("../../content/Alert/AlertView"));
 function NotificationsItemView(props) {
     var _a, _b;
     var _c = (0, react_1.useState)(false), isShow = _c[0], setIsShow = _c[1];
@@ -34,15 +38,12 @@ function NotificationsItemView(props) {
         setIsShow(!props.isClosing);
     }, [props.isClosing]);
     var bem = (0, hooks_1.useBem)('NotificationsItemView');
-    return (React.createElement(react_transition_group_1.CSSTransition, { "in": isShow, timeout: 1000, classNames: bem(bem.block((_a = {},
+    return (React.createElement(react_transition_group_1.CSSTransition, { "in": isShow, timeout: 1000, classNames: bem.block((_a = {},
             _a[props.position] = true,
-            _a))), unmountOnExit: true },
-        React.createElement("div", { className: bem(bem.block((_b = {},
-                _b[props.level] = true,
+            _a)), unmountOnExit: true },
+        React.createElement("div", { className: bem.block((_b = {},
                 _b[props.position] = true,
-                _b)), 'alert', 'alert-' + props.level) },
-            React.createElement("div", { className: bem.element('body') },
-                React.createElement("div", { className: bem.element('message') }, props.message),
-                React.createElement("button", { className: bem.element('close'), onClick: props.onClose })))));
+                _b)) },
+            React.createElement(AlertView_1["default"], { onClose: props.onClose, message: props.message, type: props.level, showClose: true, isExist: true, isVisible: true, showIcon: true }))));
 }
 exports["default"] = NotificationsItemView;

package/layout/Notifications/NotificationsItemView.scss

@@ -1,51 +1,13 @@
 .NotificationsItemView {
+
   overflow: hidden;
   max-height: 120px;
   padding: 0;
 
   border-width: 0;
-  box-shadow: 1px 0px 6px rgba(0, 0, 0, 0.1);
 
   transition: opacity .6s, transform .4s,
   max-height .6s .4s, margin .6s .6s;
-
-  &__body{
-    width: 100%;
-    height: 100%;
-
-    padding: 0.75rem 1.8rem 0.75rem 1.25rem;
-    border: 1px solid transparent;
-    border-color: inherit;
-  }
-
-  &__close{
-    cursor: pointer;
-    position: absolute;
-    top: 0;
-    right: 0;
-    width: 25px;
-    height: 25px;
-
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    .IconView{
-      svg{
-        width: 10px;
-      }
-    }
-
-    svg{
-      opacity: 0.4;
-      transition: opacity .1s ease-in;
-    }
-    &:hover svg{
-      opacity: 1;
-    }
-  }
-
-
   // Styles for React-Transition-Groups
   ////////////////////////////////////////
 

package/layout/Notifications/NotificationsView.scss

@@ -1,6 +1,9 @@
 .NotificationsView {
   z-index: 9999;
   position: fixed;
+  display: flex;
+  flex-direction: column;
+  row-gap: 10px;
   width: 400px;
 
   margin: 0;

package/nav/Nav/NavBarView.js

@@ -42,9 +42,14 @@ var Button_1 = __importDefault(require("@steroidsjs/core/ui/form/Button"));
 var hooks_1 = require("@steroidsjs/core/hooks");
 function NavBarView(props) {
     var bem = (0, hooks_1.useBem)('NavBarView');
-    return (React.createElement("div", { className: bem('navbar-expand-lg navbar-nav', props.dark && 'navbar-dark bg-dark', bem.block(), props.className) },
-        React.createElement("div", { className: 'navbar-nav px-3' }, props.items.map(function (item, index) { return (React.createElement("li", { key: item.id || index, className: bem('nav-item text-nowrap', item.isActive && 'active') },
-            React.createElement(Button_1["default"], __assign({ link: true, className: bem('nav-link', item.isActive && 'active'), onClick: function () { return props.onClick(item, index); } }, item)))); })),
-        props.children));
+    return (React.createElement("div", { className: bem(bem.block({
+            size: props.size
+        }), props.className) },
+        React.createElement("ul", { className: bem.element('list') }, props.items.map(function (item, index) { return (React.createElement("li", { key: item.id || index, className: bem(bem.element('list-item', {
+                active: item.isActive,
+                disabled: item.disabled
+            }), props.navClassName) },
+            React.createElement(Button_1["default"], __assign({ size: props.size, link: !item.isActive, onClick: function () { return props.onClick(item, index); } }, item)))); })),
+        React.createElement("div", { className: bem.element('content') }, props.children)));
 }
 exports["default"] = NavBarView;

package/nav/Nav/NavBarView.scss

@@ -1,2 +1,33 @@
 .NavBarView {
-}
+    $root: &;
+
+    color: $text-color;
+
+    &__list {
+        display: flex;
+        flex-flow: column nowrap;
+        row-gap: 8px;
+
+        &-item {
+            .ButtonView__text {
+                color: $element-placeholder-color;
+            }
+
+
+            &_active { 
+                .ButtonView__text { 
+                    color: $white;
+                }
+            }
+
+            &_disabled {
+                cursor: not-allowed;
+                .ButtonView {
+                    pointer-events: none;
+                }
+            }
+        }
+    }
+
+    @include navs-sizes($root);
+}

package/nav/Nav/NavButtonView.js

@@ -42,8 +42,14 @@ var Button_1 = __importDefault(require("@steroidsjs/core/ui/form/Button"));
 var hooks_1 = require("@steroidsjs/core/hooks");
 function NavButtonView(props) {
     var bem = (0, hooks_1.useBem)('NavButtonView');
-    return (React.createElement("div", { className: bem(bem.block(), props.className) },
-        React.createElement("div", { className: bem(props.children && 'mb-3', bem.element('nav')) }, props.items.map(function (item, index) { return (React.createElement(Button_1["default"], __assign({ key: item.id || index, color: 'secondary', outline: !item.isActive, disabled: props.disabled, onClick: function () { return props.onClick(item, index); }, className: bem.element('nav-item') }, item))); })),
+    return (React.createElement("div", { className: bem(bem.block({
+            size: props.size
+        }), props.className) },
+        React.createElement("ul", { className: bem.element('list') }, props.items.map(function (item, index) { return (React.createElement("li", { key: item.id || index, className: bem(bem.element('list-item', {
+                active: item.isActive,
+                disabled: item.disabled
+            }), props.navClassName) },
+            React.createElement(Button_1["default"], __assign({ size: props.size, color: 'secondary', outline: !item.isActive, disabled: item.disabled, onClick: function () { return props.onClick(item, index); } }, item)))); })),
         React.createElement("div", { className: bem.element('content') }, props.children)));
 }
 exports["default"] = NavButtonView;

package/nav/Nav/NavButtonView.scss

@@ -1,7 +1,8 @@
 .NavButtonView {
-  &__nav-item {
-    &:not(:last-child) {
-      margin-right: 5px;
+  
+    &__list { 
+        display: flex;
+        flex-flow: column nowrap;
+        row-gap: 8px;
     }
-  }
-}
+}

package/nav/Nav/NavIconView.js

@@ -40,10 +40,15 @@ exports.__esModule = true;
 var React = __importStar(require("react"));
 var Button_1 = __importDefault(require("@steroidsjs/core/ui/form/Button"));
 var hooks_1 = require("@steroidsjs/core/hooks");
+var DEFAULT_ICON = 'add';
 function NavIconView(props) {
     var bem = (0, hooks_1.useBem)('NavIconView');
     return (React.createElement("div", { className: bem(bem.block(), props.className) },
-        props.items.map(function (item, index) { return (React.createElement(Button_1["default"], __assign({ icon: props.icon ? props.icon : 'add', key: item.id || index, link: true, onClick: function () { return props.onClick(item, index); } }, item, { label: null, hint: item.hint || item.label || null }))); }),
-        props.children));
+        React.createElement("ul", { className: bem.element('list') }, props.items.map(function (item, index) { return (React.createElement("li", { key: item.id || index, className: bem(bem.element('list-item', {
+                active: item.isActive,
+                disabled: item.disabled
+            }), props.navClassName) },
+            React.createElement(Button_1["default"], __assign({ icon: props.icon ? props.icon : DEFAULT_ICON, link: true, onClick: function () { return props.onClick(item, index); } }, item, { label: null, hint: item.hint || item.label || null })))); })),
+        React.createElement("div", { className: bem.element('content') }, props.children)));
 }
 exports["default"] = NavIconView;

package/nav/Nav/NavIconView.scss

@@ -1,9 +1,8 @@
 .NavIconView {
-  > a {
-    margin-right: 5px;
-
-    &:last-child {
-      margin-right: 0;
+    &__list {
+        display: flex;
+        flex-flow: row nowrap;
+        align-items: center;
+        column-gap: 24px;
     }
-  }
-}
+}

package/nav/Nav/NavLinkView.js

@@ -42,8 +42,14 @@ var Button_1 = __importDefault(require("@steroidsjs/core/ui/form/Button"));
 var hooks_1 = require("@steroidsjs/core/hooks");
 function NavLinkView(props) {
     var bem = (0, hooks_1.useBem)('NavLinkView');
-    return (React.createElement("div", { className: bem(bem.block(), props.className) },
-        React.createElement("div", { className: bem.element('nav mb-3') }, props.items.map(function (item, index) { return (React.createElement(Button_1["default"], __assign({ key: item.id || index, link: true, onClick: function () { return props.onClick(item, index); }, className: bem.element('nav-item') }, item))); })),
+    return (React.createElement("div", { className: bem(bem.block({
+            size: props.size
+        }), props.className) },
+        React.createElement("ul", { className: bem.element('list') }, props.items.map(function (item, index) { return (React.createElement("li", { key: item.id || index, className: bem(bem.element('list-item', {
+                active: item.isActive,
+                disabled: item.disabled
+            }), props.navClassName) },
+            React.createElement(Button_1["default"], __assign({ link: true, onClick: function () { return props.onClick(item, index); } }, item)))); })),
         React.createElement("div", { className: bem.element('content') }, props.children)));
 }
 exports["default"] = NavLinkView;

package/nav/Nav/NavLinkView.scss

@@ -1,7 +1,16 @@
 .NavLinkView {
-  &__nav-item {
-    &:not(:last-child) {
-      margin-right: 10px;
+    &__list {
+        display: flex;
+        flex-flow: row nowrap;
+        column-gap: 24px;
+
+        &-item {
+            &_disabled {
+                cursor: not-allowed;
+                .ButtonView {
+                    pointer-events: none;
+                }
+            }
+        }
     }
-  }
-}
+}

package/nav/Nav/NavListView.js

@@ -42,16 +42,20 @@ var Link_1 = __importDefault(require("@steroidsjs/core/ui/nav/Link"));
 var hooks_1 = require("@steroidsjs/core/hooks");
 function NavListView(props) {
     var bem = (0, hooks_1.useBem)('NavListView');
-    var renderItems = function (items) {
+    var renderItems = function (items, parentItemProps) {
+        if (parentItemProps === void 0) { parentItemProps = null; }
         if (!items || items.length === 0) {
             return null;
         }
-        return items.map(function (item, index) { return (React.createElement("li", { key: index, className: bem('nav-item', bem.element('item'), props.navClassName) },
-            React.createElement(Link_1["default"], __assign({ onClick: function () { return props.onClick(item, index); } }, item, { key: item.id || index, className: bem(item.isActive && 'active', bem.element('item-link'), item.className) })),
-            item.items && item.items.length > 0 && (React.createElement("ul", { className: bem('nav flex-column', bem.element('sub-list')) }, renderItems(item.items))))); });
+        return items.map(function (item, index) { return (React.createElement("li", { key: item.id || index, className: bem(bem.element('list-item', {
+                active: item.isActive,
+                disabled: item.disabled
+            }), props.navClassName) },
+            React.createElement(Link_1["default"], __assign({ onClick: function () { return props.onClick(item, index); } }, item, { disabled: (parentItemProps === null || parentItemProps === void 0 ? void 0 : parentItemProps.disabled) || item.disabled })),
+            item.items && item.items.length > 0 && (React.createElement("ul", { className: bem.element('sub-list') }, renderItems(item.items, item))))); });
     };
-    return (React.createElement("ul", { className: bem('nav flex-column', bem.block(), props.className) },
-        renderItems(props.items),
-        props.children));
+    return (React.createElement("div", { className: bem(bem.block(), props.className) },
+        React.createElement("ul", { className: bem.element('list') }, renderItems(props.items)),
+        React.createElement("div", { className: bem.element('content') }, props.children)));
 }
 exports["default"] = NavListView;

package/nav/Nav/NavListView.scss

@@ -1,12 +1,13 @@
 .NavListView {
-  &__item {
+    
+    &__list{ 
+        display: flex;
+        flex-flow: column nowrap;
+    }
 
-  }
-  &__item-link {
-    padding: 5px 10px;
-    display: inline-block;
-  }
-  &__sub-list {
-    margin-left: 15px;
-  }
-}
+    &__sub-list { 
+        display: flex;
+        flex-flow: column;
+        padding: 5px;
+    }    
+}

package/nav/Nav/NavTabsView.js

@@ -42,9 +42,14 @@ var Button_1 = __importDefault(require("@steroidsjs/core/ui/form/Button"));
 var hooks_1 = require("@steroidsjs/core/hooks");
 function NavTabsView(props) {
     var bem = (0, hooks_1.useBem)('NavTabsView');
-    return (React.createElement("div", { className: bem(bem.block(), props.className) },
-        React.createElement("div", { className: bem('nav nav-tabs', !props.children && 'mb-3') }, props.items.map(function (item, index) { return (React.createElement("li", { key: item.id || index, className: 'nav-item' },
-            React.createElement(Button_1["default"], __assign({ link: true, onClick: function () { return props.onClick(item, index); } }, item, { className: bem('nav-link', item.isActive && 'active', item.className) })))); })),
-        props.children));
+    return (React.createElement("div", { className: bem(bem.block({
+            size: props.size
+        }), props.className) },
+        React.createElement("ul", { className: bem.element('list') }, props.items.map(function (item, index) { return (React.createElement("li", { key: item.id || index, className: bem(bem.element('list-item', {
+                active: item.isActive,
+                disabled: item.disabled
+            }), props.navClassName) },
+            React.createElement(Button_1["default"], __assign({ size: props.size, link: !item.isActive, onClick: function () { return props.onClick(item, index); } }, item)))); })),
+        React.createElement("div", { className: bem.element('content') }, props.children)));
 }
 exports["default"] = NavTabsView;

package/nav/Nav/NavTabsView.scss

@@ -1,2 +1,48 @@
 .NavTabsView {
-}
+    $root: &;
+
+    color: $text-color;
+
+    &__list {
+        display: inline-flex;
+        flex-flow: row nowrap;
+        align-items: center;
+
+        border-bottom: 1px solid $element-border-color;
+
+        &-item {
+            .ButtonView__text {
+                color: $element-placeholder-color;
+            }
+
+            &_active {
+                .ButtonView__text {
+                    color: $white;
+                }
+
+                .ButtonView {
+                    &_size {
+                        &_sm {
+                            border-radius: $radius-small $radius-small 0 0;
+                        }
+                        &_md {
+                            border-radius: $radius-large $radius-large 0 0;
+                        }
+                        &_lg {
+                            border-radius: $radius-large $radius-large 0 0;
+                        }
+                    }
+                }
+            }
+
+            &_disabled {
+                cursor: not-allowed;
+                .ButtonView {
+                    pointer-events: none;
+                }
+            }
+        }
+    }
+
+    @include navs-sizes($root);
+}

package/nav/Tree/TreeView.scss

@@ -1,65 +1,69 @@
 .TreeView {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-
-  &__item {
+    list-style: none;
+    margin: 0;
     padding: 0;
-    cursor: pointer;
 
-    > .ButtonView {
-      margin: 2px 0;
+    &__item {
+        padding: 0;
+        cursor: pointer;
+
+        > .ButtonView {
+            margin: 2px 0;
+        }
     }
-  }
 
-  &__item-label {
-    position: relative;
-    padding: 5px 10px;
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-    background-color: $background-color;
+    &__item-label {
+        position: relative;
+        padding: 5px 10px;
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-start;
+        background-color: $background-color;
 
-    .ButtonView__link {
-      color: $text-color;
-    }
+        .ButtonView__link {
+            .ButtonView__text {
+                color: $text-color;
+            }
+        }
 
-    // &:hover {
-    //   color: $list-group-action-hover-color;
-    //   background-color: $list-group-hover-bg;
-    // }
+        // &:hover {
+        //   color: $list-group-action-hover-color;
+        //   background-color: $list-group-hover-bg;
+        // }
 
-    &, &:hover {
-      text-decoration: none !important;
+        &,
+        &:hover {
+            text-decoration: none !important;
+        }
     }
-  }
-  &__item_selected &__item-label {
-    background-color: $secondary;
-    &, &::before {
-      color: $text-color;
+    &__item_selected &__item-label {
+        background-color: $secondary;
+        &,
+        &::before {
+            color: $text-color;
+        }
+    }
+    &__item-label::before {
+        display: inline-block;
+        content: "";
+        transform: rotate(0);
+        width: 21px;
+        height: 20px;
+        font-size: 12px;
+        font-weight: bold;
+        margin-left: 10px;
+        color: $text-color;
+        position: relative;
+        top: 1px;
+        left: 3px;
+    }
+    &__item_has-items &__item-label::before {
+        content: ">";
     }
-  }
-  &__item-label::before {
-    display: inline-block;
-    content: '';
-    transform: rotate(0);
-    width: 21px;
-    height: 20px;
-    font-size: 12px;
-    font-weight: bold;
-    margin-left: 10px;
-    color: $text-color;
-    position: relative;
-    top: 1px;
-    left: 3px;
-  }
-  &__item_has-items &__item-label::before {
-    content: '>';
-  }
 
-  &__item_opened &__item-label::before {
-    top: 7px;
-    left: -4px;
-    transform: rotate(90deg);
-  }
+    &__item_opened &__item-label::before {
+        top: 7px;
+        left: -4px;
+        transform: rotate(90deg);
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steroidsjs/bootstrap",
-    "version": "3.0.0-beta.65",
+    "version": "3.0.0-beta.67",
     "description": "",
     "main": "index.js",
     "author": "Vladimir Kozhin <hello@kozhindev.com>",

package/scss/mixins/index.scss

@@ -2,4 +2,5 @@
 @import "typography";
 @import "scroll";
 @import "customMixins";
-@import "date";
+@import "date";
+@import "navs";

package/scss/mixins/navs.scss

@@ -0,0 +1,39 @@
+@mixin navs-sizes($root) {
+    &_size {
+        &_lg {
+            .ButtonView__link {
+                padding: 16px;
+            }
+
+            #{$root}__list-item_active {
+                .ButtonView {
+                    padding: 16px;
+                }
+            }
+        }
+
+        &_md {
+            .ButtonView__link {
+                padding: 12px;
+            }
+
+            #{$root}__list-item_active {
+                .ButtonView {
+                    padding: 12px;
+                }
+            }
+        }
+
+        &_sm {
+            .ButtonView__link {
+                padding: 8px;
+            }
+
+            #{$root}__list-item_active {
+                .ButtonView {
+                    padding: 8px;
+                }
+            }
+        }
+    }
+}