@dataloop-ai/components 0.19.274 → 0.19.276

package/moveToPublic.sh

@@ -3,5 +3,5 @@
 mkdir -p public/icons
 mkdir -p public/icons/assets
 
-mv node_modules/@dataloop-ai/icons/assets public/icons
+cp -r node_modules/@dataloop-ai/icons/assets public/icons
  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dataloop-ai/components",
-  "version": "0.19.274",
+  "version": "0.19.276",
   "exports": {
     ".": "./index.ts",
     "./models": "./models.ts",

package/src/components/compound/DlDateTime/DlDateTimeRange/DlDateTimeCard.vue

@@ -0,0 +1,166 @@
+<template>
+    <div :id="uuid" class="dl-date-time-range-card" :style="computedStyles">
+        <div class="dl-date-time-range-card--content">
+            <dl-date-picker
+                :model-value="dateInterval"
+                :available-range="availableRange"
+                :disabled="disabled"
+                single-calendar
+                single-selection
+                @update:model-value="dateSelected"
+            />
+            <dl-time-picker
+                v-if="showTime"
+                :disabled="disabled"
+                :model-value="dateInterval"
+                single-time
+                @update:model-value="updateDateInterval"
+            />
+
+            <dl-button
+                size="s"
+                outlined
+                class="dl-date-time-range-card--button"
+                @click="handleClearAction"
+            >
+                <span style="text-transform: capitalize"> Clear </span>
+            </dl-button>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+import { v4 } from 'uuid'
+import {
+    computed,
+    defineComponent,
+    PropType,
+    ref,
+    toRefs,
+    watch
+} from 'vue-demi'
+import { DateInterval } from '../types'
+import { DlTimePicker } from '../DlTimePicker'
+import DlDatePicker from '../DlDatePicker/DlDatePicker.vue'
+import { DlButton } from '../../../basic'
+import { isEqual } from 'lodash'
+
+export default defineComponent({
+    components: {
+        DlDatePicker,
+        DlTimePicker,
+        DlButton
+    },
+    model: {
+        prop: 'modelValue',
+        event: 'update:model-value'
+    },
+    props: {
+        modelValue: {
+            type: Object as PropType<Date | null>,
+            default: null
+        },
+        showTime: Boolean,
+        availableRange: {
+            type: Object as PropType<Partial<DateInterval> | null>,
+            default: null
+        },
+        disabled: Boolean,
+        width: {
+            type: String,
+            default: 'auto'
+        }
+    },
+    emits: ['update:model-value', 'date-selected', 'change', 'clear'],
+    setup(props, { emit }) {
+        const { modelValue, availableRange, width } = toRefs(props)
+
+        const uuid = ref(`dl-date-time-card-${v4()}`)
+        const dateInterval = computed<DateInterval>({
+            get() {
+                return modelValue.value
+                    ? {
+                          from: modelValue.value,
+                          to: new Date(modelValue.value)
+                      }
+                    : null
+            },
+            set(val: DateInterval | null) {
+                emit('update:model-value', val ? val.from : null)
+            }
+        })
+
+        const handleClearAction = () => {
+            emit('clear')
+            updateDateInterval(null)
+        }
+
+        const computedStyles = computed(() => {
+            return {
+                '--card-content-width': width.value
+            }
+        })
+
+        const updateDateInterval = (value: DateInterval | null) => {
+            if (value === null) {
+                dateInterval.value = null
+            } else {
+                const newVal = {
+                    from: value.from,
+                    to: new Date(value.from)
+                } as DateInterval
+
+                if (isEqual(newVal, dateInterval.value)) {
+                    return
+                }
+
+                dateInterval.value = newVal
+            }
+            emit('change', value ? value.from : null)
+        }
+
+        const dateSelected = (value: DateInterval) => {
+            const val = {
+                from: value.from,
+                to: new Date(value.from)
+            }
+            emit('date-selected', val.from)
+            updateDateInterval(val)
+        }
+
+        watch(availableRange, () => {
+            updateDateInterval(null)
+        })
+
+        return {
+            uuid,
+            dateInterval,
+            handleClearAction,
+            updateDateInterval,
+            dateSelected,
+            computedStyles
+        }
+    }
+})
+</script>
+
+<style lang="scss" scoped>
+.dl-date-time-range-card {
+    background-color: var(--dl-color-bg);
+    display: flex;
+    border-radius: 2px;
+    border-radius: 2px;
+
+    &--content {
+        width: var(--card-content-width);
+    }
+
+    &--button {
+        display: flex;
+        margin-left: auto;
+        width: fit-content;
+        margin-right: 16px;
+        margin-bottom: 16px;
+    }
+}
+</style>

package/src/components/compound/DlDateTime/DlDateTimeRange/DlDateTimePicker.vue

@@ -14,62 +14,36 @@
                 :disabled="disabled"
             >
                 <div class="dl-date-time-range--card">
-                    <div
-                        class="dl-date-time-range--card_content"
-                        :style="cardContentStyles"
-                    >
-                        <dl-date-picker
-                            :model-value="dateInterval"
-                            :available-range="availableRange"
-                            :disabled="isInputDisabled"
-                            single-calendar
-                            single-selection
-                            @update:model-value="
-                                updateDateIntervalWithAutoClose
-                            "
-                        />
-                        <dl-time-picker
-                            v-if="showTime"
-                            :disabled="isInputDisabled"
-                            :model-value="dateInterval"
-                            single-time
-                            @update:model-value="updateDateInterval"
-                        />
-
-                        <dl-button
-                            size="s"
-                            outlined
-                            class="dl-date-time-range--button"
-                            @click="handleClearAction"
-                        >
-                            <span style="text-transform: capitalize">
-                                Clear
-                            </span>
-                        </dl-button>
-                    </div>
+                    <dl-date-time-card
+                        ref="dateTimeRangeCard"
+                        :model-value="modelValue"
+                        :show-time="showTime"
+                        :available-range="availableRange"
+                        :width="datePickerCardWidth"
+                        :disabled="disabled"
+                        @update:model-value="handleModelValueChange"
+                        @date-selected="onDateSelected"
+                        @clear="handleClearAction"
+                    />
                 </div>
             </dl-menu>
         </date-input>
     </div>
 </template>
 <script lang="ts">
-import { DlTimePicker } from '../DlTimePicker'
 import { DateInterval } from '../types'
 import { CustomDate } from '../DlDatePicker/models/CustomDate'
-import DlDatePicker from '../DlDatePicker/DlDatePicker.vue'
 import DateInput from './DateInput.vue'
+import DlDateTimeCard from './DlDateTimeCard.vue'
 import { DlMenu } from '../../../essential'
-import { DlButton } from '../../../basic'
 import { defineComponent, PropType } from 'vue-demi'
 import { v4 } from 'uuid'
 
 export default defineComponent({
     components: {
-        DlDatePicker,
-        DlTimePicker,
         DateInput,
         DlMenu,
-        DlButton
+        DlDateTimeCard
     },
     model: {
         prop: 'modelValue',
@@ -103,18 +77,11 @@ export default defineComponent({
     emits: ['update:model-value', 'set-type', 'change'],
     data(): {
         uuid: string
-        dateInterval: DateInterval | null
         isOpen: boolean
         isInputDisabled: boolean
     } {
         return {
             uuid: `dl-date-time-range-${v4()}`,
-            dateInterval: this.modelValue
-                ? {
-                      from: this.modelValue,
-                      to: new Date(this.modelValue)
-                  }
-                : null,
             isOpen: false,
             isInputDisabled: false
         }
@@ -124,63 +91,30 @@ export default defineComponent({
             return { width: `${this.dateInputText.length / 2}em` }
         },
         dateInputText(): string {
-            if (this.dateInterval === null) {
+            if (this.modelValue === null) {
                 return this.placeholder
             }
 
             let text = ''
 
             if (this.showTime) {
-                text = CustomDate.format(
-                    this.dateInterval.from,
-                    'MMM D, YYYY, HH:mm'
-                )
+                text = CustomDate.format(this.modelValue, 'MMM D, YYYY, HH:mm')
             } else {
-                text = CustomDate.format(this.dateInterval.from, 'MMM D, YYYY')
+                text = CustomDate.format(this.modelValue, 'MMM D, YYYY')
             }
 
             return text
-        },
-        cardContentStyles(): Record<string, any> {
-            return {
-                '--card-content-width': this.datePickerCardWidth
-            }
-        }
-    },
-    watch: {
-        availableRange: {
-            handler() {
-                this.updateDateInterval(null)
-            },
-            deep: true
-        },
-        modelValue(value: Date | null) {
-            this.dateInterval = value && {
-                from: value,
-                to: new Date(value)
-            }
         }
     },
     methods: {
         handleClearAction() {
             this.isInputDisabled = false
-            this.updateDateInterval(null)
         },
-        updateDateInterval(value: DateInterval | null) {
-            if (value === null) {
-                this.dateInterval = null
-            } else {
-                this.dateInterval = {
-                    from: value.from,
-                    to: new Date(value.from)
-                }
-            }
-            this.$emit('update:model-value', value?.from)
-            this.$emit('change', value?.from)
+        handleModelValueChange(value: Date) {
+            this.$emit('update:model-value', value)
+            this.$emit('change', value)
         },
-        updateDateIntervalWithAutoClose(value: DateInterval) {
-            this.updateDateInterval(value)
-
+        onDateSelected() {
             if (this.autoClose) {
                 const dateTimeRangeMenu = this.$refs[
                     'dateTimeRangeMenu'
@@ -199,23 +133,10 @@ export default defineComponent({
     justify-content: center;
 
     &--card {
-        background-color: var(--dl-color-bg);
         z-index: 1;
         display: flex;
-        border-radius: 2px;
-        border-radius: 2px;
-    }
-
-    &--card_content {
-        width: var(--card-content-width);
-    }
-
-    &--button {
-        display: flex;
-        margin-left: auto;
-        width: fit-content;
-        margin-right: 16px;
-        margin-bottom: 16px;
+        width: 100%;
+        height: 100%;
     }
 }
 </style>

package/src/components/compound/DlDateTime/DlDateTimeRange/index.ts

@@ -1,4 +1,5 @@
 import DlDateTimeRange from './DlDateTimeRange.vue'
 import DlDateTimePicker from './DlDateTimePicker.vue'
+import DlDateTimeCard from './DlDateTimeCard.vue'
 
-export { DlDateTimeRange, DlDateTimePicker }
+export { DlDateTimeRange, DlDateTimePicker, DlDateTimeCard }