react-bootstrap-front 3.7.6 → 3.7.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-bootstrap-front",
-  "version": "3.7.6",
+  "version": "3.7.7",
   "description": "React Bootstrap Components",
   "keywords": [
     "Bootstrap 4",

package/src/features/advanced/DefaultQuickSearch.js

@@ -8,10 +8,14 @@ export default class DefaultQuickSearch extends Component {
     name: PropTypes.string.isRequired,
     label: PropTypes.string,
     icon: PropTypes.element.isRequired,
+    plus: PropTypes.element,
+    reset: PropTypes.element,
   };
 
   static defaultProps = {
     label: '',
+    plus: null,
+    reset: null,
   };
 
   static getDerivedStateFromProps(props, state) {
@@ -38,11 +42,11 @@ export default class DefaultQuickSearch extends Component {
     this.setState({ search: event.target.value });
   }
 
-  onSubmit(event) {
+  onSubmit(event, mode) {
     if (event) {
       event.preventDefault();
     }
-    this.props.onSubmit(this.state.search);
+    this.props.onSubmit(this.state.search, mode);
   }
 
   render() {
@@ -58,9 +62,19 @@ export default class DefaultQuickSearch extends Component {
             onChange={this.onChange}
           />
           <div className="input-group-append">
-            <button type="button" className="btn btn-outline-secondary bg-light" onClick={this.onSubmit}>
+            <button type="button" title="Recherche simple" className="btn btn-outline-secondary bg-light" onClick={(ev) => this.onSubmit(ev, "simple")}>
               {this.props.icon}
             </button>
+            {this.props.plus &&
+              <button type="button" title="Recherche mois stricte" className="btn btn-outline-secondary bg-light" onClick={(ev) => this.onSubmit(ev, "plus")}>
+                {this.props.plus}
+              </button>
+            }
+            {this.props.reset &&
+              <button type="button" title="Initialiser la recherche" className="btn btn-outline-secondary bg-light" onClick={(ev) => this.onSubmit(ev, "reset")}>
+                {this.props.reset}
+              </button>
+            }
           </div>
         </div>
       </form>

package/src/features/advanced/DropdownWrapper.js

@@ -39,16 +39,13 @@ export default class DropdownWrapper extends Component {
   }
 
   render() {
+    const clonedTrigger = React.cloneElement(
+      this.props.trigger,
+      {ref: this.state.ref, onClick: this.onClick, title: this.props.tooltip}
+    )
     return (
       <>
-        <div
-          ref={this.state.ref}
-          className={classnames('advanced-dropdown-wrapper', this.props.className)}
-          onClick={this.onClick}
-          title={this.props.tooltip}
-        >
-          {this.props.trigger}
-        </div>
+        {clonedTrigger}
         {this.state.open && (
           <Dropdown align={this.props.align} myRef={this.state.ref} onClose={this.onClose}>
             <div onClick={this.onClose}>{this.props.children}</div>

package/src/features/advanced/ResponsiveModalInner.scss

@@ -33,7 +33,6 @@
         margin-left: 20px;
         margin-right: 10px;
         padding: 2px;
-        background-color: theme-color('secondary');
       }
       .nav-link-inner-btn:hover {
         background-color: theme-color('secondary-light');

package/src/features/basic/CalmButton.js

@@ -99,13 +99,13 @@ export default class CalmButton extends Component {
                 {this.props.options.map(option => {
                   return (
                     <DropdownMenuOption
-                      key={`text-${option.id}`}
+                      key={`text-${option.value}`}
                       label={option.label}
                       onClick={ev => {
                         if (ev) {
                           ev.preventDefault();
                         }
-                        option.onClick();
+                        this.props.onClick(option.value);
                         this.onOptionsMenuClose();
                       }}
                     />