toggle-components-library 1.33.0-beta.11 → 1.33.0-beta.12

package/src/components/tables/ToggleTable.vue

@@ -3,58 +3,29 @@
     <div>
 
     <table class="toggle-table">
-        <thead :class="{'toggle-table-any-search-active': anySearchActive}">
+        <thead :class="{'toggle-table-any-search-active': searchActive}">
             <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"
-                  :colspan="field.colspan"
+              <th 
+                  scope="col" 
+                  :class="['toggle-table-th', {'toggle-table-search-active': tableSearchActive(field), 'toggle-table-searchable':field.filterable}]"  
+                  v-for="(field, index) in headers" 
                   :key="index"
                   :style="'width:'+field.width"
                   @click="activateSearch(field)"
               >
-                  <div class="toggle-table-th-inner" @transitionend="handleTransitionEnd">
-
+                  <div class="toggle-table-th-inner">
                     <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)"/>
 
-                    <ToggleInputText
-                        v-if="field.type === 'text' && (searchModels[field.key] || editingInput === field.key)"
-                        type="text"
-                        :ref="field.key+'-input'"
-                        v-model="searchModels[field.key]"
-                        @input="searchChange(field)"
-                        @bail="closeSearch(field)"
-                        :applyFocus="applyFocus"
-                    />
-                    <ToggleInputSelect
-                        style="margin-top:2px;"
-                        :size="'small'"
-                        v-if="field.type === 'select' && (searchModels[field.key] || editingInput === field.key)"
-                        :applyFocus="applyFocus"
-                        :options="field.select_options"
-                        v-model="searchModels[field.key]"
-                        @input="val=>searchChange(val, field)"
-                    />
-                    <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="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)" />
                   </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>
@@ -91,34 +62,20 @@ 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:{},
-                anySearchActive: false,
-                applyFocus: false,
-                searchTimeout: null
+                searchModels:{}
             };
         },
         computed: {
@@ -140,23 +97,36 @@ 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_range' ? this.setInitialDate(i) : (this.fields[i].value ?? '');
-
+                    let value = this.fields[i].type == 'date' ? 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]);
@@ -167,29 +137,20 @@ 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;
@@ -199,64 +160,36 @@ export default {
 
             tableSearchActive(field)
             {
-                if(field.type === 'date_range'){
-                    return (this.searchModels[field.key].start || this.searchModels[field.key].end || this.editingInput === field.key);
+                if(field.type == 'date'){
+                    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_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.searchModels[field.key] = field.type == 'date' ? { start: false, end: false} : '' ;
                 this.searchChange();
             },
 
             searchChange(){
-                clearTimeout(this.searchTimeout);
-                this.searchTimeout = setTimeout(()=>{
-                    this.$emit('search', this.fieldsWithSearch);
-                },this.searchDebounce);
-
+                this.$emit('search', this.fieldsWithSearch);
             },
 
             /* 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 || field.readonly) return;
+                if(!field.filterable) return;
+                if(field.type === 'date'){
+                    this.datePickerOpen = true;
+                }
                 this.editingInput = field.key;
-                this.anySearchActive = true;
+                //this.$nextTick(() => this.$refs[this.editingInput + '-input'].focus())
             },
 
-
+            
 
         }
     }

package/src/index.js

@@ -4,7 +4,6 @@ import ToggleInputText from "./components/forms/ToggleInputText.vue";
 import ToggleInputEditableText from "./components/forms/ToggleInputEditableText.vue";
 import ToggleInputWebsite from "./components/forms/ToggleInputWebsite.vue";
 import ToggleDatePicker from "./components/forms/ToggleDatePicker.vue";
-import ToggleDateRangePicker from "./components/forms/ToggleDateRangePicker.vue";
 import ToggleInputSelect from "./components/forms/ToggleInputSelect.vue";
 import ToggleInputPercentage from "./components/forms/ToggleInputPercentage.vue";
 import ToggleInputCurrency from "./components/forms/ToggleInputCurrency.vue";
@@ -104,14 +103,13 @@ const Components = {
     ToggleInputEditableText,
     ToggleInputWebsite,
     ToggleDatePicker,
-    ToggleDateRangePicker,
     ToggleInputSelect,
     ToggleInputPercentage,
     ToggleInputCurrency,
     ToggleInputRadioButtons,
     ToggleInputTextArea,
     ToggleInputCheckboxContainer,
-    ToggleInputCheckbox, 
+    ToggleInputCheckbox,
     ToggleInputCheckboxInline,
     ToggleFillLoader,
     ToggleProgressLoader,