@onereach/ui-components 2.62.7-beta.1930.0 → 2.62.7-beta.1932.0

package/src/components/or-segmented-control-v3/OrSegmentedControl.stories3.ts

@@ -0,0 +1,106 @@
+import { action } from '@storybook/addon-actions';
+import { Meta, StoryFn } from '@storybook/vue3';
+import { ref, watch } from 'vue-demi';
+import OrSegmentedControlDocs from './OrSegmentedControl.docs.mdx';
+import OrSegmentedControl from './OrSegmentedControl.vue';
+import { SegmentedControlSize } from './props';
+import { SegmentedControlOption } from './types';
+
+export default {
+  title: 'Components/Forms/Segmented Control',
+  component: OrSegmentedControl,
+
+  argTypes: {
+    // Props
+    options: {
+      control: { type: 'object' },
+    },
+
+    modelValue: {
+      control: { type: 'text' },
+    },
+
+    value: { // TODO: Remove Vue 2 fallback
+      table: { disable: true },
+    },
+
+    size: {
+      control: { type: 'select' },
+      options: Object.values(SegmentedControlSize),
+    },
+
+    disabled: {
+      control: { type: 'boolean' },
+    },
+
+    // Events
+    'update:modelValue': {
+      table: { disable: true },
+    },
+
+    input: {
+      table: { disable: true },
+    },
+  },
+
+  parameters: {
+    layout: 'centered',
+
+    docs: {
+      page: OrSegmentedControlDocs,
+    },
+
+    design: {
+      type: 'figma',
+      url: 'https://www.figma.com/file/o7DdkaznUW2PtX4wiSuhhQ/Core?node-id=410%3A2097&t=7N93DAotOYMOX2kx-1',
+    },
+  },
+} as Meta<typeof OrSegmentedControl>;
+
+const Template: StoryFn<typeof OrSegmentedControl> = (args) => ({
+  components: {
+    OrSegmentedControl,
+  },
+
+  setup() {
+    // State
+    const model = ref<string>();
+
+    // Effects
+    watch(model, (value) => {
+      console.debug(value);
+    });
+
+    return {
+      args,
+      model,
+      onUpdateModelValue: action('update:modelValue'),
+      onInput: action('input'),
+    };
+  },
+
+  template: `
+    <OrSegmentedControl
+      v-model="model"
+      v-bind="args"
+      @update:modelValue="onUpdateModelValue"
+      @input="onInput"
+    />
+  `,
+});
+
+export const Base = Template.bind({});
+
+Base.args = {
+  // Props
+  options: Array.from<string, SegmentedControlOption>([
+    'Alfa',
+    'Bravo',
+    'Charlie',
+    'Delta',
+    'Echo',
+  ], (item) => ({
+    value: item.toLowerCase(),
+    label: item,
+  })),
+};

package/src/components/{or-sort-header-v3/OrSortHeader.vue → or-segmented-control-v3/OrSegmentedControl.vue}

@@ -3,50 +3,61 @@
     ref="root"
     v-bind="$attrs"
     :class="rootStyles"
-    :activated="activated ? '' : null"
-    @click.stop="toggleDirection()"
   >
-    <slot />
-
-    <template v-if="activated">
-      <OrIcon
-        :class="{ 'rotate-180': proxyModelValue.direction === 'asc' }"
-        :icon="'arrow_downward'"
-      />
-    </template>
+    <OrSegmentedControlItem
+      v-for="option in options"
+      :key="option.value"
+      :size="size"
+      :selected="option.value === proxyModelValue"
+      :disabled="disabled"
+      @click.stop="proxyModelValue = option.value"
+    >
+      {{ option.label }}
+    </OrSegmentedControlItem>
   </div>
 </template>
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
 import { useClassAttribute } from '../../hooks';
-import { OrIconV3 as OrIcon } from '../or-icon-v3';
-import { SortHeaderRoot } from './styles';
-import { SortHeaderModel } from './types';
+import OrSegmentedControlItem from './components/or-segmented-control-item/OrSegmentedControlItem.vue';
+import { SegmentedControlSize } from './props';
+import { SegmentedControlRoot, SegmentedControlRootSizes } from './styles';
+import { SegmentedControlOption } from './types';
 
 export default defineComponent({
-  name: 'OrSortHeader',
+  name: 'OrSegmentedControl',
 
   components: {
-    OrIcon,
+    OrSegmentedControlItem,
   },
 
   inheritAttrs: false,
 
   props: {
+    options: {
+      type: Array as PropType<SegmentedControlOption[]>,
+      default: [] as SegmentedControlOption[],
+    },
+
     modelValue: {
-      type: Object as PropType<SortHeaderModel>,
+      type: String,
       default: undefined,
     },
 
     value: { // TODO: Remove Vue 2 fallback
-      type: Object as PropType<SortHeaderModel>,
+      type: String,
       default: undefined,
     },
 
-    inputValue: { // TODO: Rename to `value` after complete migration to Vue 3
-      type: String,
-      required: true,
+    size: {
+      type: String as PropType<SegmentedControlSize>,
+      default: SegmentedControlSize.M,
+    },
+
+    disabled: {
+      type: Boolean,
+      default: false,
     },
   },
 
@@ -54,8 +65,6 @@ export default defineComponent({
     'update:modelValue',
 
     'input',
-    'focus',
-    'blur',
   ],
 
   expose: [
@@ -70,8 +79,9 @@ export default defineComponent({
     const classAttribute = useClassAttribute();
 
     const rootStyles = computed(() => [
-      'or-sort-header',
-      ...SortHeaderRoot,
+      'or-segmented-control',
+      ...SegmentedControlRoot,
+      ...SegmentedControlRootSizes[props.size],
       classAttribute.value,
     ]);
 
@@ -87,24 +97,10 @@ export default defineComponent({
       },
     });
 
-    const activated = computed(() => {
-      return proxyModelValue.value?.column === props.inputValue;
-    });
-
-    // Methods
-    function toggleDirection(): void {
-      proxyModelValue.value = {
-        column: props.inputValue,
-        direction: proxyModelValue.value?.direction === 'asc' ? 'desc' : 'asc',
-      };
-    }
-
     return {
       root,
       rootStyles,
       proxyModelValue,
-      activated,
-      toggleDirection,
     };
   },
 });

package/src/components/or-segmented-control-v3/components/or-segmented-control-item/OrSegmentedControlItem.vue

@@ -0,0 +1,64 @@
+<template>
+  <div
+    ref="root"
+    v-bind="$attrs"
+    :class="rootStyles"
+    :selected="selected ? '' : null"
+    :disabled="disabled ? '' : null"
+    @click="$emit('click', $event)"
+  >
+    <div :class="['truncate']">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, PropType, ref } from 'vue-demi';
+import { useClassAttribute } from '../../../../hooks';
+import { SegmentedControlSize } from '../../props';
+import { SegmentedControlItemRoot, SegmentedControlItemRootSizes } from './styles';
+
+export default defineComponent({
+  name: 'OrSegmentedControlItem',
+
+  inheritAttrs: false,
+
+  props: {
+    size: {
+      type: String as PropType<SegmentedControlSize>,
+      required: true,
+    },
+
+    selected: {
+      type: Boolean,
+      default: false,
+    },
+
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+  },
+
+  setup(props) {
+    // Refs
+    const root = ref<HTMLElement>();
+
+    // Styles
+    const classAttribute = useClassAttribute();
+
+    const rootStyles = computed(() => [
+      'or-segmented-control-item',
+      ...SegmentedControlItemRoot,
+      ...SegmentedControlItemRootSizes[props.size],
+      classAttribute.value,
+    ]);
+
+    return {
+      root,
+      rootStyles,
+    };
+  },
+});
+</script>

package/src/components/or-segmented-control-v3/components/or-segmented-control-item/styles.ts

@@ -0,0 +1,50 @@
+import { SegmentedControlSize } from '../../props';
+
+export const SegmentedControlItemRoot: string[] = [
+  // Layout
+  'flex',
+  'items-center',
+  'justify-center',
+
+  // Shape
+  'rounded-md',
+
+  // Interactivity
+  'interactivity-auto',
+
+  // Theme
+  'theme-foreground-default',
+  'dark:theme-foreground-default-dark',
+
+  // Theme (selected)
+  'selected:theme-background-default',
+  'dark:selected:theme-background-default-dark',
+
+  // Theme (selected, enabled)
+  'selected:enabled:shadow-card',
+  'dark:selected:enabled:shadow-card-dark',
+];
+
+export const SegmentedControlItemRootSizes: Record<SegmentedControlSize, string[]> = {
+  'm': [
+    // Box
+    'h-[44px] md:h-[36px]',
+
+    // Spacing
+    'px-sm+ md:px-sm+',
+
+    // Typography
+    'typography-body-2-regular',
+  ],
+
+  's': [
+    // Box
+    'h-[36px] md:h-[32px]',
+
+    // Spacing
+    'px-sm+ md:px-sm',
+
+    // Typography
+    'typography-caption-regular',
+  ],
+};

package/src/components/or-segmented-control-v3/index.ts

@@ -0,0 +1,3 @@
+export { default as OrSegmentedControlV3 } from './OrSegmentedControl.vue';
+export * from './props';
+export * from './types';

package/src/components/or-segmented-control-v3/props.ts

@@ -0,0 +1,4 @@
+export enum SegmentedControlSize {
+  M = 'm',
+  S = 's',
+}

package/src/components/or-segmented-control-v3/styles.ts

@@ -0,0 +1,24 @@
+import { SegmentedControlSize } from './props';
+
+export const SegmentedControlRoot: string[] = [
+  // Layout
+  'grid',
+  'grid-flow-col',
+  'auto-cols-fr',
+
+  // Shape
+  'rounded-md',
+
+  // Spacing
+  'px-[2px]',
+  'py-[2px]',
+
+  // Theme
+  'theme-background-surface-variant',
+  'dark:theme-background-surface-variant-dark',
+];
+
+export const SegmentedControlRootSizes: Record<SegmentedControlSize, string[]> = {
+  'm': [],
+  's': [],
+};

package/src/components/or-segmented-control-v3/types.ts

@@ -0,0 +1,4 @@
+export interface SegmentedControlOption {
+  value: string;
+  label: string;
+}

package/src/components/or-select-v3/OrSelect.vue

@@ -193,11 +193,9 @@
     </OrInputBox>
 
     <template v-if="!invalid">
-      <template v-if="hint">
-        <OrHint :disabled="disabled">
-          {{ hint }}
-        </OrHint>
-      </template>
+      <OrHint :disabled="disabled">
+        {{ hint }}
+      </OrHint>
     </template>
 
     <template v-else>

package/src/components/or-switch-v3/OrSwitch.stories3.ts

@@ -27,7 +27,7 @@ export default {
     },
 
     value: { // TODO: Remove Vue 2 fallback
-      control: { type: 'object' },
+      table: { disable: true },
     },
 
     inputValue: { // TODO: Rename to `value` after complete migration to Vue 3

package/src/components/or-tabs-v3/OrTabs.stories3.ts

@@ -1,6 +1,6 @@
 import { action } from '@storybook/addon-actions';
 import { Meta, StoryFn } from '@storybook/vue3';
-import { ref } from 'vue-demi';
+import { ref, watch } from 'vue-demi';
 import OrTabsDocs from './OrTabs.docs.mdx';
 import OrTabs from './OrTabs.vue';
 import { TabsVariant } from './props';
@@ -63,11 +63,16 @@ const Template: StoryFn<typeof OrTabs> = (args) => ({
 
   setup() {
     // State
-    const value = ref<string>();
+    const model = ref<string>();
+
+    // Effects
+    watch(model, (value) => {
+      console.debug(value);
+    });
 
     return {
       args,
-      value,
+      model,
       onUpdateModelValue: action('update:modelValue'),
       onInput: action('input'),
     };
@@ -75,7 +80,7 @@ const Template: StoryFn<typeof OrTabs> = (args) => ({
 
   template: `
     <OrTabs
-      v-model="value"
+      v-model="model"
       v-bind="args"
       @update:modelValue="onUpdateModelValue"
       @input="onInput"

package/src/components/or-tabs-v3/OrTabs.vue

@@ -8,7 +8,7 @@
       <OrTab
         v-for="tab in tabs.normal"
         :key="tab.value"
-        :selected="proxyModelValue === tab.value"
+        :selected="tab.value === proxyModelValue"
         @click.stop="proxyModelValue = tab.value"
       >
         {{ tab.label }}

package/src/components/or-textarea-v3/OrTextarea.vue

@@ -40,18 +40,16 @@
     </OrInputBox>
 
     <template v-if="!invalid">
-      <template v-if="hint || maxLength">
-        <OrHint :disabled="disabled">
-          {{ hint }}
-
-          <template
-            v-if="maxLength"
-            v-slot:addon
-          >
-            {{ currentLength }} / {{ maxLength }}
-          </template>
-        </OrHint>
-      </template>
+      <OrHint :disabled="disabled">
+        {{ hint }}
+
+        <template
+          v-if="maxLength"
+          v-slot:addon
+        >
+          {{ currentLength }} / {{ maxLength }}
+        </template>
+      </OrHint>
     </template>
 
     <template v-else>

package/src/hooks/useClassAttribute.ts

@@ -8,7 +8,7 @@ export function useClassAttribute(): UseClassAttributeReturn {
 
   // Functions
   function composeClass(): UnwrapRef<UseClassAttributeReturn> {
-    const { staticClass = '', class: classProperty } = (currentInstance?.vnode as VNode).data ?? {};
+    const { staticClass = '', class: classProperty } = (currentInstance?.vnode as unknown as VNode).data ?? {};
 
     if (!classProperty) {
       return staticClass || undefined;