haya-select 1.0.7 → 1.0.10

package/.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: weekly
+    time: "01:00"
+    timezone: Europe/Copenhagen
+  open-pull-requests-limit: 99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haya-select",
-  "version": "1.0.7",
+  "version": "1.0.10",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -12,5 +12,9 @@
     "classnames": "^2.3.1",
     "debounce": "^1.2.1",
     "diggerize": "^1.0.4"
+  },
+  "peerDependencies": {
+    "prop-types": ">= 15.7.2",
+    "react": ">= 16.0.0"
   }
 }

package/src/select/index.jsx

@@ -14,8 +14,9 @@ const nameForComponentWithMultiple = (component) => {
   return name
 }
 
-export default class CustomSelect extends React.PureComponent {
+export default class HayaSelect extends React.PureComponent {
   static defaultProps = {
+    defaultToggled: {},
     multiple: false,
     search: false
   }
@@ -23,13 +24,16 @@ export default class CustomSelect extends React.PureComponent {
   static propTypes = {
     attribute: PropTypes.string,
     className: PropTypes.string,
+    defaultToggled: PropTypes.object,
     defaultValue: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     defaultValues: PropTypes.array,
     defaultValuesFromOptions: PropTypes.array,
+    id: PropTypes.node,
     model: PropTypes.object,
     multiple: PropTypes.bool.isRequired,
     onChange: PropTypes.func,
     options: PropTypes.oneOfType([PropTypes.array, PropTypes.func]).isRequired,
+    placeholder: PropTypes.node,
     search: PropTypes.bool.isRequired,
     toggleOptions: PropTypes.arrayOf(PropTypes.shape({
       icon: PropTypes.string.isRequired,
@@ -51,7 +55,7 @@ export default class CustomSelect extends React.PureComponent {
     optionsWidth: undefined,
     scrollLeft: undefined,
     scrollTop: undefined,
-    toggled: {}
+    toggled: digg(this, "props", "defaultToggled")
   }
 
   defaultCurrentOptions() {
@@ -79,16 +83,31 @@ export default class CustomSelect extends React.PureComponent {
   }
 
   componentDidMount() {
-    const {attribute, defaultValuesFromOptions, model, options} = this.props
+    const {attribute, defaultValue, defaultValuesFromOptions, model, options} = this.props
 
-    if ((defaultValuesFromOptions || (attribute && model)) && typeof options == "function") {
+    if (((defaultValue || defaultValuesFromOptions) || (attribute && model)) && typeof options == "function") {
       this.loadDefaultValuesFromOptionsCallback()
     }
   }
 
   render() {
     const {endOfSelectRef} = digs(this, "endOfSelectRef")
-    const {attribute, className, defaultValue, defaultValues, model, multiple, onChange, options, search, toggleOptions, ...restProps} = this.props
+    const {
+      attribute,
+      className,
+      defaultToggled,
+      defaultValue,
+      defaultValues,
+      id,
+      model,
+      multiple,
+      onChange,
+      options,
+      placeholder,
+      search,
+      toggleOptions,
+      ...restProps
+    } = this.props
     const {currentOptions, opened} = digs(this.state, "currentOptions", "opened")
     const BodyPortal = config.getBodyPortal()
 
@@ -120,17 +139,19 @@ export default class CustomSelect extends React.PureComponent {
             <>
               {currentOptions.length == 0 &&
                 <div style={{color: "grey"}}>
-                  {I18n.t("haya_select.nothing_selected")}
+                  {placeholder || I18n.t("haya_select.nothing_selected")}
                 </div>
               }
               {currentOptions.map((currentOption) =>
                 <div className="current-option" key={`current-value-${digg(currentOption, "value")}`}>
-                  <input
-                    id={idForComponent(this)}
-                    name={nameForComponentWithMultiple(this)}
-                    type="hidden"
-                    value={digg(currentOption, "value")}
-                  />
+                  {nameForComponentWithMultiple(this) &&
+                    <input
+                      id={idForComponent(this)}
+                      name={nameForComponentWithMultiple(this)}
+                      type="hidden"
+                      value={digg(currentOption, "value")}
+                    />
+                  }
                   {this.presentOption(currentOption)}
                 </div>
               )}
@@ -143,9 +164,10 @@ export default class CustomSelect extends React.PureComponent {
   }
 
   defaultValues () {
-    const {attribute, defaultValuesFromOptions, model} = this.props
+    const {attribute, defaultValue, defaultValuesFromOptions, model} = this.props
 
     if (defaultValuesFromOptions) return defaultValuesFromOptions
+    if (defaultValue) return defaultValue
 
     if (attribute && model) {
       if (!(attribute in model)) throw new Error(`No such attribute on ${model.modelClassData().name}: ${attribute}`)
@@ -374,15 +396,19 @@ export default class CustomSelect extends React.PureComponent {
     )
 
     if (!multiple) this.closeOptions()
-
   }
 
   presentOption = (currentValue) => {
-    const {toggleOptions} = this.props
+    const {toggleOptions} = this.props || {}
     const {toggled} = digs(this.state, "toggled")
 
     return (
-      <div>
+      <div
+        className="haya-select-option-presentation"
+        data-toggle-icon={toggleOptions && toggled && toggleOptions[toggled[currentValue.value]]?.icon}
+        data-toggle-value={toggleOptions && toggled && toggleOptions[toggled[currentValue.value]]?.value}
+        data-value={currentValue.value}
+      >
         {toggleOptions && !(currentValue.value in toggled) &&
           <i className="fa fa-fw" />
         }