@steroidsjs/bootstrap 3.0.0-beta.29 → 3.0.0-beta.30

package/form/CheckboxField/CheckboxFieldView.js

@@ -43,9 +43,12 @@ 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: "".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 },
+    return (React.createElement("div", { className: bem(bem.block({
+            size: props.size,
+            hasErrors: !!props.errors
+        }), props.className), style: props.style, onClick: props.onChange },
+        React.createElement("input", __assign({ className: bem.element('input'), id: id }, props.inputProps, { disabled: props.disabled, required: props.required })),
+        React.createElement("label", { className: 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

@@ -115,8 +115,73 @@
             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
+    &_size {
+        &_lg {
+            #{$root}__label {
+                &::before {
+                    width: 24px;
+                    height: 24px;
+                    border-radius: $radius-small;
+                    margin-right: 12px;
+                }
+                &::after {
+                    width: 26px;
+                    height: 26px;
+                    border-radius: $radius-large;
+                }
+
+                &-text {
+                    font-size: $font-size-lg;
+                    line-height: 24px;
+                }
+            }
+        }
+
+        &_md {
+            #{$root}__label {
+                &::before {
+                    width: 20px;
+                    height: 20px;
+                    border-radius: 6px;
+                }
+
+                &::after {
+                    width: 22px;
+                    height: 22px;
+                    border-radius: $radius-medium;
+                    transform: translate(-13.5%, -13.5%);
+                }
+
+                &-text {
+                    font-size: $font-size-base;
+                    line-height: 22px;
+                }
+            }
+        }
+
+        &_sm {
+            #{$root}__label {
+                &::before {
+                    width: 16px;
+                    height: 16px;
+                    border-radius: 6px;
+                }
+
+                &::after {
+                    width: 18px;
+                    height: 18px;
+                    border-radius: $radius-medium;
+                    transform: translate(-15.5%, -15.5%);
+                }
+
+                &-text {
+                    font-size: $font-size-sm;
+                    line-height: 18px;
+                }
+            }
+        }
     }
 }
 .has-errors label {

package/form/DropDownField/DropDownFieldView.js

@@ -33,20 +33,29 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
+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 hooks_1 = require("@steroidsjs/core/hooks");
+var Icon_1 = __importDefault(require("@steroidsjs/core/ui/content/Icon"));
+var content_1 = require("@steroidsjs/core/ui/content");
+var DropDownItem_1 = __importDefault(require("./views/DropDownItem"));
+var getSelectedItemsLabel = function (selectedItems) { return (selectedItems
+    .map(function (selectedItem) { return selectedItem.label; })
+    .join(', ')); };
+var getSelectedItemsCount = function (selectedItems) {
+    var _a;
+    if (selectedItems.length <= 1) {
+        return (_a = selectedItems[0]) === null || _a === void 0 ? void 0 : _a.label;
+    }
+    return "".concat(__('Выбрано'), " (").concat(selectedItems.length, ")");
+};
+var toDropDownItem = function (props) { return function (item, itemIndex) { return (React.createElement(DropDownItem_1["default"], __assign({}, props, { key: itemIndex, item: item }))); }; };
 function DropDownFieldView(props) {
+    var _a;
     var bem = (0, hooks_1.useBem)('DropDownFieldView');
     var inputRef = (0, react_1.useRef)(null);
     // Auto focus on search
@@ -55,48 +64,38 @@ function DropDownFieldView(props) {
             inputRef.current.focus();
         }
     }, [props.isAutoComplete, props.isOpened, props.isSearchAutoFocus]);
-    var renderItem = function (item, level) {
-        if (level === void 0) { level = 0; }
-        if (props.groupAttribute && Array.isArray(item[props.groupAttribute])) {
-            return __spreadArray([
-                (React.createElement("div", { key: String(item[props.primaryKey]), className: bem.element('drop-down-item', 'group') }, item.label))
-            ], item[props.groupAttribute].map(function (subItem) { return renderItem(subItem, level + 1); }), true);
-        }
-        return (React.createElement("div", { key: String(item[props.primaryKey]), className: bem.element('drop-down-item', {
-                hover: props.hoveredId === item[props.primaryKey],
-                select: props.selectedIds.includes(item[props.primaryKey]),
-                level: level
-            }), onClick: function (e) {
-                e.preventDefault();
-                props.onItemSelect(item[props.primaryKey]);
-            }, onFocus: function () { return props.onItemHover(item[props.primaryKey]); }, onMouseOver: function () { return props.onItemHover(item[props.primaryKey]); } }, item.label));
-    };
-    return (React.createElement("div", { ref: props.forwardedRef, className: bem(bem.block({ size: props.size }), props.className), style: props.style },
+    var renderPlaceholder = React.useCallback(function () {
+        var _a;
+        return props.placeholder && !((_a = props.selectedIds) === null || _a === void 0 ? void 0 : _a.length)
+            ? (React.createElement("div", { className: bem.element('placeholder') }, props.placeholder))
+            : null;
+    }, [bem, props.placeholder, props.selectedIds]);
+    var renderItems = React.useCallback(function () { return props.groupAttribute
+        ? (React.createElement(content_1.Accordion, null, props.items.map(toDropDownItem(props))))
+        : (React.createElement(React.Fragment, null, props.items.map(toDropDownItem(props)))); }, [props]);
+    return (React.createElement("div", { ref: props.forwardedRef, className: bem(bem.block((_a = {
+                size: props.size
+            },
+            _a["".concat(props.color)] = !!props.color && !props.outline,
+            _a["outline_".concat(props.color)] = props.outline,
+            _a.opened = props.isOpened,
+            _a)), props.className), onKeyPress: function (e) { return e.key === 'Enter' && props.onOpen(); }, style: props.style, role: "button", tabIndex: 0 },
         React.createElement("div", { className: bem.element('selected-items', {
                 reset: props.showReset,
-                'no-border': props.noBorder,
-                'is-invalid': !!props.errors,
                 disabled: props.disabled
-            }), onClick: props.onOpen, onKeyPress: props.onOpen, tabIndex: 0, role: 'button' }, props.selectedItems.map(function (item) { return (props.multiple
-            ? (React.createElement("span", { key: String(item.id), className: bem.element('selected-item-multiple') },
-                React.createElement(React.Fragment, null,
-                    item.label,
-                    React.createElement("span", { className: bem.element('selected-item-multiple-remove'), onClick: function (e) {
-                            e.preventDefault();
-                            e.stopPropagation();
-                            props.onItemRemove(item[props.primaryKey]);
-                        }, onKeyPress: function (e) {
-                            e.preventDefault();
-                            e.stopPropagation();
-                            props.onItemRemove(item[props.primaryKey]);
-                        }, tabIndex: 0, role: 'button' },
-                        React.createElement("svg", { viewBox: "64 64 896 896", className: "", width: "1em", height: "1em" },
-                            React.createElement("path", { d: "M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3\n                                         5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4\n                                         512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3\n                                          3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z" }))))))
-            : (React.createElement("span", { key: item.id, className: bem.element('selected-item') }, item.label))); })),
-        props.showReset && props.selectedIds.length > 0 && (React.createElement("button", { className: bem.element('reset'), onClick: props.onReset, "aria-label": __('Сбросить') })),
+            }), onClick: props.onOpen, tabIndex: -1, role: 'button' },
+            renderPlaceholder(),
+            React.createElement("span", { className: bem.element('selected-items') }, props.showEllipses
+                ? getSelectedItemsLabel(props.selectedItems)
+                : getSelectedItemsCount(props.selectedItems))),
+        props.showReset && props.selectedIds.length > 0 && (React.createElement(Icon_1["default"], { name: "field-close", className: bem.element('icon-close'), tabIndex: -1, onClick: props.onReset, "aria-label": __('Сбросить') })),
+        React.createElement(Icon_1["default"], { name: 'accordion-chevron', className: bem.element('icon-chevron'), tabIndex: -1, onClick: props.onOpen }),
         props.isOpened && (React.createElement("div", { className: bem.element('drop-down') },
-            props.isAutoComplete && (React.createElement("div", { className: bem.element('search') },
-                React.createElement("input", __assign({}, props.searchInputProps, { ref: inputRef, onChange: function (e) { return props.searchInputProps.onChange(e.target.value); }, className: bem('form-control', 'form-control-' + props.size, bem.element('search-input'), props.searchInputProps.className) })))),
-            React.createElement("div", { className: bem.element('drop-down-list') }, props.items.map(function (item) { return renderItem(item); }))))));
+            props.isAutoComplete && (React.createElement("div", { className: bem.element('search', {
+                    size: props.size
+                }) },
+                React.createElement(Icon_1["default"], { name: 'search', className: bem.element('search-icon') }),
+                React.createElement("input", __assign({}, props.searchInputProps, { ref: inputRef, onChange: function (e) { return props.searchInputProps.onChange(e.target.value); }, className: bem(bem.element('search-input'), props.searchInputProps.className) })))),
+            React.createElement("div", { className: bem.element('drop-down-list') }, renderItems())))));
 }
 exports["default"] = DropDownFieldView;