toggle-components-library 1.35.0 → 1.36.0

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "toggle-components-library",
-  "version": "1.35.0",
+  "version": "1.36.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "toggle-components-library",
-    "version": "1.35.0",
+    "version": "1.36.0",
     "private": false,
     "scripts": {
         "serve": "vue-cli-service serve",

package/src/components/forms/ToggleInputSelect.vue

@@ -1,18 +1,18 @@
 <template>
 
 <div class="toggle-input-container" :class="{'toggle-input-is-invalid':isInvalid, 'toggle-input-is-disabled':disabled}"  v-on:click="focusClosestInput">
-    <label 
+    <label
         v-if="label"
-        :for="name ? name : 'ToggleInputSelect' " 
+        :for="name ? name : 'ToggleInputSelect' "
         class="toggle-input-label"
-    > {{ label }} 
+    > {{ label }}
     </label>
 
     <div class="toggle-input-select-container">
-        <select 
-            :name="name ? name : 'ToggleInputSelect' " 
+        <select
+            :name="name ? name : 'ToggleInputSelect' "
             :class="[ 'toggle-input-select', size]"
-            v-model="inputVal" 
+            v-model="inputVal"
             :autocomplete="autocomplete ? 'on' : 'off' "
             :required="required"
             :disabled="disabled"
@@ -24,7 +24,7 @@
     </div>
 
     <label
-        class="toggle-input-label-error" 
+        class="toggle-input-label-error"
         v-if="isInvalid"
         :for="name ? name : 'ToggleInputText' "
     >
@@ -39,6 +39,11 @@ import { mixins } from '../mixins/mixins'
 
 export default {
     mixins:[mixins],
+    data() {
+        return {
+          show: false
+        }
+    },
     props: {
         value: {},
         name: {
@@ -87,6 +92,7 @@ export default {
     },
 
     created : function(){
+
     },
     computed: {
         inputVal: {

package/src/components/forms/ToggleInputText.vue

@@ -1,16 +1,16 @@
 <template>
 
 <div class="toggle-input-container" :class="{'toggle-input-is-invalid':isInvalid, 'toggle-input-is-disabled':disabled}"  v-on:click="focusClosestInput">
-    <label 
+    <label
         v-if="label"
-        :for="name ? name : 'InputText' " 
+        :for="name ? name : 'InputText' "
         class="toggle-input-label"
-    > {{ label }} 
+    > {{ label }}
     </label>
     <span class="toggle-input-counter" v-if="maxLength">{{messageLength(inputVal, maxLength)}}</span>
     <input
         :type="type"
-        :name="name ? name : 'ToggleInputText' " 
+        :name="name ? name : 'ToggleInputText' "
         :class="[ 'toggle-input', size]"
         :placeholder="placeholder ? placeholder : '' "
         :autocomplete="autocomplete ? 'on' : 'off' "
@@ -19,9 +19,11 @@
         :maxlength="maxLength"
         :disabled="disabled"
         :readonly="readonly"
+        :ref="'input_ele'"
+        @keyup.esc="handleEscPress"
     />
     <label
-        class="toggle-input-label-error" 
+        class="toggle-input-label-error"
         v-if="isInvalid"
         :for="name ? name : 'ToggleInputText' "
     >
@@ -103,7 +105,9 @@ export default {
         }
     },
 
-    created : function(){
+    created : function()
+    {
+        this.$nextTick(() => this.$refs['input_ele'].focus());
     },
     computed: {
         inputVal: {
@@ -118,6 +122,11 @@ export default {
     },
     methods: {
 
+        handleEscPress()
+        {
+            this.$emit('bail');
+        },
+
         /*
         * Concat message for count characters
         * @return string

package/src/components/tables/ToggleTable.vue

@@ -3,29 +3,56 @@
     <div>
 
     <table class="toggle-table">
-        <thead :class="{'toggle-table-any-search-active': searchActive}">
+        <thead :class="{'toggle-table-any-search-active': anySearchActive}">
             <tr class="toggle-tablee-tr">
-              <th 
-                  scope="col" 
-                  :class="['toggle-table-th', {'toggle-table-search-active': tableSearchActive(field), 'toggle-table-searchable':field.filterable}]"  
-                  v-for="(field, index) in headers" 
+              <th
+                  scope="col"
+                  :class="['toggle-table-th', {'toggle-table-search-active': tableSearchActive(field), 'toggle-table-searchable':field.filterable}]"
+                  v-for="(field, index) in headers"
+                  :colspan="field.colspan"
                   :key="index"
                   :style="'width:'+field.width"
                   @click="activateSearch(field)"
               >
-                  <div class="toggle-table-th-inner">
+                  <div class="toggle-table-th-inner" @transitionend="handleTransitionEnd">
+
                     <span class="toggle-table-th-title">{{field.label}}</span>
                     <span class="toggle-table-close-search" v-on:click.stop @click="closeSearch(field)"></span>
-                    <ToggleInputText type="text" :ref="field.key+'-input'" v-model="searchModels[field.key]" @input="searchChange(field)" 
-                    v-if="field.type == 'text' && (searchModels[field.key] || editingInput == field.key)" />
-                    <ToggleInputSelect style="margin-top:2px;" size="small" v-if="field.type == 'select'  && (searchModels[field.key] || editingInput == field.key)"  :options="field.select_options" v-model="searchModels[field.key]" @input="val=>searchChange(val, field)"/>
 
-                    <ToggleDateRangePicker v-if="field.type == 'date' && (searchModels[field.key].start || searchModels[field.key].end || editingInput == field.key)" name="date" v-model="searchModels[field.key]"  @input="val=>searchChange(val, field)" />
+                    <ToggleInputText
+                        v-if="field.type === 'text' && (searchModels[field.key] || editingInput === field.key) && applyFocus"
+                        type="text"
+                        :ref="field.key+'-input'"
+                        v-model="searchModels[field.key]"
+                        @input="searchChange()"
+                        @bail="closeSearch(field)"
+                    />
+                    <ToggleInputSelect
+                        style="margin-top:2px;"
+                        :size="'small'"
+                        v-if="field.type === 'select' && (searchModels[field.key] || editingInput === field.key) && applyFocus"
+                        :options="field.select_options"
+                        v-model="searchModels[field.key]"
+                        @input="searchChange()"
+                    />
+                    <ToggleDateRangePicker
+                        v-if="field.type === 'date_range' && (searchModels[field.key].start || searchModels[field.key].end || editingInput === field.key)"
+                        name="date_range"
+                        v-model="searchModels[field.key]"
+                        @input="searchChange()"
+                    />
                   </div>
               </th>
-              
+
             </tr>
         </thead>
+        <tr class="empty-table" v-if="(items && items.length === 0) && !loading">
+          <td :colspan="headers.length">
+            <div class="full">
+              <div class="empty-area"><p>{{ emptyTableMessage }}</p></div>
+            </div>
+          </td>
+        </tr>
         <tbody v-if="!$slots.default || !$slots.default.length">
             <ToggleTableRow v-for="(item, index) in items" :key="index" >
                 <ToggleTableColumn v-for="(column, column_index) in item" :key="column_index">{{column}}</ToggleTableColumn>
@@ -62,20 +89,34 @@ export default {
                 type: [Array]
             },
             total:{
-                type: [Number] 
+                type: [Number]
             },
             per_page:{
-                type: [Number] 
+                type: [Number]
             },
             page:{
                 type: [Number],
                 default:1
+            },
+            loading: {
+                type: Boolean
+            },
+            emptyTableMessage: {
+                type: String,
+                default: "No rows returned."
+            },
+            searchDebounce: {
+                type: [Number],
+                default: 500
             }
-        },  
+        },
         data : function(){
             return {
                 editingInput:false,
-                searchModels:{}
+                searchModels:{},
+                anySearchActive: false,
+                applyFocus: false,
+                searchTimeout: null
             };
         },
         computed: {
@@ -97,36 +138,23 @@ export default {
 
             headers() {
                 if(!this.fields){
-                    return Object.keys(this.items[0]);                 
+                    return Object.keys(this.items[0]);
                 }
                 return this.fields;
             },
 
-            searchActive() { 
-                if(this.editingInput) {
-                    return true;
-                }
-                for(let col in this.searchModels){
-                    if(!this.searchModels[col])
-                        return false;
-                    if (this.searchModels[col].start !== undefined) {
-                        return true;
-                    }
-                    else if(this.searchModels[col]) return true;
-                }
-                return false;
-            },
-
-            
         },
         created : function(){
 
             if(this.fields){
+
                 for (let i = 0; i < this.fields.length; i++) {
-                    let value = this.fields[i].type == 'date' ? this.setInitialDate(i) : this.fields[i].value;
+                    let value = this.fields[i].type == 'date_range' ? this.setInitialDate(i) : (this.fields[i].value ?? '');
+
                     let field_name = this.fields[i].key;
                     this.$set( this.searchModels, field_name, value )
                     if(value){
+                        this.applyFocus = true;
                         // if date has an initial value set, show it.
                         if(typeof value.start !== 'undefined'){
                             if(value.start.length) this.activateSearch(this.fields[i]);
@@ -137,20 +165,29 @@ export default {
                     this.searchChange();
                 }
             }
-           
+
         },
 
         beforeDestroy: function () {
-        },
-        watch:{
-           
         },
         mounted : function ()
         {
 
         },
-        
+
         methods:{
+
+            handleTransitionEnd(event){
+              if(event.propertyName === 'height'){
+                  if(this.anySearchActive && !this.applyFocus){
+                      this.applyFocus = true;
+                  }
+                  if(!this.anySearchActive && this.applyFocus){
+                      this.applyFocus = false;
+                  }
+              }
+            },
+
             // set initial date
             setInitialDate(index){
                 let value = this.fields[index].value;
@@ -160,36 +197,64 @@ export default {
 
             tableSearchActive(field)
             {
-                if(field.type == 'date'){
-                    return (this.searchModels[field.key].start || this.searchModels[field.key].end || this.editingInput == field.key);
+                if(field.type === 'date_range'){
+                    return (this.searchModels[field.key].start || this.searchModels[field.key].end || this.editingInput === field.key);
                 }
-                return (this.searchModels[field.key] || this.editingInput == field.key);
+                return (this.searchModels[field.key] || this.editingInput === field.key);
 
             },
 
+
+            getSearchModelTypeFromKey(key){
+              for(let i=0; i<this.fields.length; i++){
+                if(this.fields[i].key === key){
+                  return this.fields[i].type;
+                }
+              }
+              return null;
+            },
+
             closeSearch(field){
+
                 this.editingInput = false;
-                this.searchModels[field.key] = field.type == 'date' ? { start: false, end: false} : '' ;
+                this.searchModels[field.key] = field.type === 'date_range' ? { start: false, end: false} : '' ;
+
+                // check if any search is active; if not, close/shrink header
+                let is_active = false;
+                for(const key in this.searchModels){
+
+                    if(this.getSearchModelTypeFromKey(key) === 'date_range'){
+                      if (this.searchModels[key].start || this.searchModels[key].end){
+                        is_active = true;
+                        break;
+                      }
+                    }else if(this.searchModels[key] && this.searchModels[key] !== ''){
+                        is_active = true;
+                        break;
+                    }
+                }
+                this.anySearchActive = is_active;
                 this.searchChange();
             },
 
             searchChange(){
-                this.$emit('search', this.fieldsWithSearch);
+                clearTimeout(this.searchTimeout);
+                this.searchTimeout = setTimeout(()=>{
+                    this.$emit('search', this.fieldsWithSearch);
+                },this.searchDebounce);
+
             },
 
             /* activateSearch
              * When a user clicks a searchable column name, show it as active, and focus the child input field (unless it's already active)
             */
             activateSearch(field){
-                if(!field.filterable) return;
-                if(field.type === 'date'){
-                    this.datePickerOpen = true;
-                }
+                if(!field.filterable || field.readonly) return;
                 this.editingInput = field.key;
-                //this.$nextTick(() => this.$refs[this.editingInput + '-input'].focus())
+                this.anySearchActive = true;
             },
 
-            
+
 
         }
     }