@onereach/ui-components 3.0.4-beta.2486.0 → 3.0.4-beta.2497.0

package/src/components/or-date-time-picker-v3/OrDateTimePicker.vue

@@ -27,29 +27,59 @@
       :readonly="readonly"
       :disabled="disabled"
     >
-      <input
+      <!-- <input
         ref="dateControl"
         v-dropdown-open="toggleDatePopover"
         v-dropdown-close="closeDatePopover"
         v-bind="controlAttributes"
         :class="controlStyles"
-        :type="'date'"
+        :type="'text'"
+        :value="formatDate(proxyModelValue)"
+        :required="required"
+        :readonly="readonly"
+        :disabled="disabled"
+      > -->
+
+      <!-- <input
+        ref="timeControl"
+        v-dropdown-open="toggleTimePopover"
+        v-dropdown-close="closeTimePopover"
+        v-bind="controlAttributes"
+        :class="controlStyles"
+        :type="'text'"
+        :value="formatTime(proxyModelValue)"
+        :required="required"
+        :readonly="readonly"
+        :disabled="disabled"
+      > -->
+
+      <div
+        ref="dateControl"
+        v-dropdown-open="toggleDatePopover"
+        v-dropdown-close="closeDatePopover"
+        v-bind="controlAttributes"
+        :class="controlStyles"
+        :contenteditable="true"
         :required="required"
         :readonly="readonly"
         :disabled="disabled"
       >
+        {{ formatDate(proxyModelValue) }}
+      </div>
 
-      <input
+      <div
         ref="timeControl"
         v-dropdown-open="toggleTimePopover"
         v-dropdown-close="closeTimePopover"
         v-bind="controlAttributes"
         :class="controlStyles"
-        :type="'time'"
+        :contenteditable="true"
         :required="required"
         :readonly="readonly"
         :disabled="disabled"
       >
+        {{ formatTime(proxyModelValue) }}
+      </div>
 
       <OrPopover
         ref="datePopover"
@@ -59,19 +89,20 @@
       >
         <OrDateTimePickerPopoverHeader>
           <OrDateTimePickerMobileControl label="Date">
-            Sep 12
+            {{ formatDateAlt(draftModelValue) }}
           </OrDateTimePickerMobileControl>
 
           <OrDateTimePickerMobileControl label="Time">
-            9:07
+            {{ formatTimeAlt(draftModelValue) }}
           </OrDateTimePickerMobileControl>
         </OrDateTimePickerPopoverHeader>
 
-        <OrDateTimePickerMonthSelect v-model="proxyModelValue" />
-        <OrDateTimePickerDateSelect v-model="proxyModelValue" />
+        <OrDateTimePickerMonthSelect v-model="draftModelValue" />
+        <OrDateTimePickerDaySelect v-model="draftModelValue" />
 
         <OrDateTimePickerPopoverFooter
-          @reject="closeDatePopover()"
+          @resolve="proxyModelValue = draftModelValue; datePopover.close()"
+          @reject="draftModelValue = proxyModelValue; datePopover.close()"
         />
       </OrPopover>
 
@@ -83,18 +114,19 @@
       >
         <OrDateTimePickerPopoverHeader>
           <OrDateTimePickerMobileControl label="Date">
-            Sep 12
+            {{ formatDateAlt(draftModelValue) }}
           </OrDateTimePickerMobileControl>
 
           <OrDateTimePickerMobileControl label="Time">
-            9:07
+            {{ formatTimeAlt(draftModelValue) }}
           </OrDateTimePickerMobileControl>
         </OrDateTimePickerPopoverHeader>
 
-        <OrDateTimePickerTimeSelect v-model="proxyModelValue" />
+        <OrDateTimePickerTimeSelect v-model="draftModelValue" />
 
         <OrDateTimePickerPopoverFooter
-          @reject="closeTimePopover()"
+          @resolve="proxyModelValue = draftModelValue; timePopover.close()"
+          @reject="draftModelValue = proxyModelValue; timePopover.close()"
         />
       </OrPopover>
 
@@ -129,8 +161,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, PropType, reactive, ref } from 'vue-demi';
-import { DateTimePickerSize } from '.';
+import { computed, defineComponent, PropType, reactive, ref, watch } from 'vue-demi';
 import { DropdownClose, DropdownOpen } from '../../directives';
 import { useControlAttributes, useIdAttribute, useValidationAttributes } from '../../hooks';
 import { OrErrorV3 as OrError } from '../or-error-v3';
@@ -139,19 +170,20 @@ import { OrIconButtonV3 as OrIconButton } from '../or-icon-button-v3';
 import { OrInputBoxV3 as OrInputBox } from '../or-input-box-v3';
 import { OrLabelV3 as OrLabel } from '../or-label-v3';
 import { OrPopoverV3 as OrPopover } from '../or-popover-v3';
-import OrDateTimePickerDateSelect from './partials/or-date-time-picker-date-select/OrDateTimePickerDateSelect.vue';
+import OrDateTimePickerDaySelect from './partials/or-date-time-picker-day-select/OrDateTimePickerDaySelect.vue';
 import OrDateTimePickerMobileControl from './partials/or-date-time-picker-mobile-control/OrDateTimePickerMobileControl.vue';
 import OrDateTimePickerMonthSelect from './partials/or-date-time-picker-month-select/OrDateTimePickerMonthSelect.vue';
 import OrDateTimePickerPopoverFooter from './partials/or-date-time-picker-popover-footer/OrDateTimePickerPopoverFooter.vue';
 import OrDateTimePickerPopoverHeader from './partials/or-date-time-picker-popover-header/OrDateTimePickerPopoverHeader.vue';
 import OrDateTimePickerTimeSelect from './partials/or-date-time-picker-time-select/OrDateTimePickerTimeSelect.vue';
+import { DateTimePickerSize } from './props';
 import { DateTimePicker, DateTimePickerControl } from './styles';
 
 export default defineComponent({
   name: 'OrDateTimePicker',
 
   components: {
-    OrDateTimePickerDateSelect,
+    OrDateTimePickerDaySelect,
     OrDateTimePickerMobileControl,
     OrDateTimePickerMonthSelect,
     OrDateTimePickerPopoverFooter,
@@ -276,6 +308,12 @@ export default defineComponent({
       },
     });
 
+    const draftModelValue = ref<Date>();
+
+    watch(proxyModelValue, (value) => {
+      draftModelValue.value = value;
+    }, { immediate: true });
+
     // Methods
     function toggleDatePopover(): void {
       if (!props.readonly && !props.disabled) {
@@ -321,6 +359,34 @@ export default defineComponent({
       }
     }
 
+    function formatDate(value?: Date): string {
+      return value?.toLocaleString('default', {
+        dateStyle: 'short',
+        timeZone: 'UTC',
+      }) ?? '--';
+    }
+
+    function formatTime(value?: Date): string {
+      return value?.toLocaleString('default', {
+        timeStyle: 'short',
+        timeZone: 'UTC',
+      }) ?? '--';
+    }
+
+    function formatDateAlt(value?: Date): string {
+      return value?.toLocaleString('default', {
+        dateStyle: 'medium',
+        timeZone: 'UTC',
+      }) ?? '--';
+    }
+
+    function formatTimeAlt(value?: Date): string {
+      return value?.toLocaleString('default', {
+        timeStyle: 'short',
+        timeZone: 'UTC',
+      }) ?? '--';
+    }
+
     return {
       root,
       dateControl,
@@ -333,10 +399,15 @@ export default defineComponent({
       controlStyles,
       controlAttributes,
       proxyModelValue,
+      draftModelValue,
       toggleDatePopover,
       toggleTimePopover,
       closeDatePopover,
       closeTimePopover,
+      formatDate,
+      formatTime,
+      formatDateAlt,
+      formatTimeAlt,
     };
   },
 });
@@ -348,26 +419,4 @@ input {
   background: none;
   outline: none;
 }
-
-input[type="date"]::-webkit-datetime-edit-day-field,
-input[type="date"]::-webkit-datetime-edit-month-field,
-input[type="date"]::-webkit-datetime-edit-year-field {
-  display: none;
-}
-
-input[type="time"]::-webkit-datetime-edit-hour-field,
-input[type="time"]::-webkit-datetime-edit-minute-field,
-input[type="time"]::-webkit-datetime-edit-ampm-field {
-  display: none;
-}
-
-input[type="date"]::-webkit-datetime-edit-text,
-input[type="time"]::-webkit-datetime-edit-text {
-  display: none;
-}
-
-input[type="date"]::-webkit-calendar-picker-indicator,
-input[type="time"]::-webkit-calendar-picker-indicator {
-  display: none;
-}
 </style>

package/src/components/or-date-time-picker-v3/hooks/useDefaultDate.ts

@@ -0,0 +1,3 @@
+export function useDefaultDate(): number {
+  return new Date().getUTCDate();
+}

package/src/components/or-date-time-picker-v3/hooks/useDefaultHours.ts

@@ -0,0 +1,3 @@
+export function useDefaultHours(): number {
+  return 0;
+}

package/src/components/or-date-time-picker-v3/hooks/useDefaultMinutes.ts

@@ -0,0 +1,3 @@
+export function useDefaultMinutes(): number {
+  return 0;
+}

package/src/components/or-date-time-picker-v3/hooks/useDefaultMonth.ts

@@ -0,0 +1,3 @@
+export function useDefaultMonth(): number {
+  return new Date().getUTCMonth();
+}

package/src/components/or-date-time-picker-v3/hooks/useDefaultYear.ts

@@ -0,0 +1,3 @@
+export function useDefaultYear(): number {
+  return new Date().getUTCFullYear();
+}

package/src/components/or-date-time-picker-v3/partials/or-date-time-picker-day-select/OrDateTimePickerDaySelect.vue

@@ -0,0 +1,162 @@
+<template>
+  <div
+    ref="root"
+    :class="rootStyles"
+  >
+    <div :class="buttonGroupStyles">
+      <OrButton
+        v-for="value in dayOptions"
+        :key="Number(value)"
+        :class="buttonGroupItemStyles"
+        :variant="Number(value) === Number(proxyModelValue) ? 'contained' : 'text'"
+        :color="Number(value) === Number(proxyModelValue) ? 'primary' : 'inherit'"
+        @click.stop="proxyModelValue = value"
+      >
+        {{ formatDay(value) }}
+      </OrButton>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, ref } from 'vue-demi';
+import { OrButtonV3 as OrButton } from '../../../or-button-v3';
+import { useDefaultDate } from '../../hooks/useDefaultDate';
+import { useDefaultHours } from '../../hooks/useDefaultHours';
+import { useDefaultMinutes } from '../../hooks/useDefaultMinutes';
+import { useDefaultMonth } from '../../hooks/useDefaultMonth';
+import { useDefaultYear } from '../../hooks/useDefaultYear';
+import { DateTimePickerDaySelect, DateTimePickerDaySelectButtonGroup, DateTimePickerDaySelectButtonGroupItem } from './styles';
+
+export default defineComponent({
+  name: 'OrDateTimePickerDaySelect',
+
+  components: {
+    OrButton,
+  },
+
+  model: {
+    prop: 'modelValue',
+    event: 'update:modelValue',
+  },
+
+  props: {
+    modelValue: {
+      type: Date,
+      default: undefined,
+    },
+  },
+
+  emits: [
+    'update:modelValue',
+  ],
+
+  expose: [
+    'root',
+  ],
+
+  setup(props, context) {
+    // Refs
+    const root = ref<HTMLElement>();
+
+    // Styles
+    const rootStyles = computed(() => [
+      'or-date-time-picker-day-select',
+      ...DateTimePickerDaySelect,
+    ]);
+
+    const buttonGroupStyles = computed(() => [
+      ...DateTimePickerDaySelectButtonGroup,
+    ]);
+
+    const buttonGroupItemStyles = computed(() => [
+      ...DateTimePickerDaySelectButtonGroupItem,
+    ]);
+
+    // State
+    const proxyModelValue = computed({
+      get: () => props.modelValue ?? new Date(Date.UTC(
+        useDefaultYear(),
+        useDefaultMonth(),
+        useDefaultDate(),
+        useDefaultHours(),
+        useDefaultMinutes(),
+      )),
+
+      set: (value) => {
+        context.emit('update:modelValue', value);
+      },
+    });
+
+    const dayOptions = computed(() => {
+      const monthStartDate = new Date(Date.UTC(
+        proxyModelValue.value.getUTCFullYear(),
+        proxyModelValue.value.getUTCMonth(),
+        1,
+        proxyModelValue.value.getUTCHours(),
+        proxyModelValue.value.getUTCMinutes(),
+      ));
+
+      const monthEndDate = new Date(Date.UTC(
+        proxyModelValue.value.getUTCFullYear(),
+        proxyModelValue.value.getUTCMonth() + 1,
+        0,
+        proxyModelValue.value.getUTCHours(),
+        proxyModelValue.value.getUTCMinutes(),
+      ));
+
+      const calendarStartDate = new Date(Date.UTC(
+        monthStartDate.getUTCFullYear(),
+        monthStartDate.getUTCMonth(),
+        1 - (monthStartDate.getUTCDay() + 6) % 7,
+        monthStartDate.getUTCHours(),
+        monthStartDate.getUTCMinutes(),
+      ));
+
+      const calendarEndDate = new Date(Date.UTC(
+        monthEndDate.getUTCFullYear(),
+        monthEndDate.getUTCMonth() + 1,
+        (7 - monthEndDate.getUTCDay()) % 7,
+        monthEndDate.getUTCHours(),
+        monthEndDate.getUTCMinutes(),
+      ));
+
+      return (() => {
+        let options = [] as Date[], value = calendarStartDate;
+
+        while (Number(value) !== Number(calendarEndDate)) {
+          options = [...options, value];
+
+          value = new Date(Date.UTC(
+            value.getUTCFullYear(),
+            value.getUTCMonth(),
+            value.getUTCDate() + 1,
+            value.getUTCHours(),
+            value.getUTCMinutes(),
+          ));
+        }
+
+        return options;
+      })();
+    });
+
+    // Methods
+    function formatDay(value: Date): string {
+      return value.toLocaleString('default', {
+        day: 'numeric',
+        timeZone: 'UTC',
+      });
+    }
+
+    return {
+      root,
+      rootStyles,
+      buttonGroupStyles,
+      buttonGroupItemStyles,
+      proxyModelValue,
+      dayOptions,
+      formatDay,
+    };
+  },
+});
+</script>

package/src/components/or-date-time-picker-v3/partials/or-date-time-picker-day-select/styles.ts

@@ -0,0 +1,31 @@
+export const DateTimePickerDaySelect: string[] = [
+  // Layout
+  'layout-column',
+
+  // Spacing
+  'px-md',
+  'py-md',
+
+  'gap-sm',
+];
+
+export const DateTimePickerDaySelectButtonGroup: string[] = [
+  // Layout
+  'grid',
+  'grid-cols-7',
+
+  // Spacing
+  'gap-xs',
+];
+
+export const DateTimePickerDaySelectButtonGroupItem: string[] = [
+  // Box
+  'min-w-fit',
+
+  // Spacing
+  '!px-sm',
+  '!py-sm',
+
+  // Typography
+  'typography-caption-regular',
+];