@onereach/ui-components 2.71.1-beta.2217.0 → 2.71.1-beta.2221.0

package/src/components/or-sidebar-v3/styles.ts

@@ -4,97 +4,28 @@ export const SidebarRoot: string[] = [
   // Position
   'relative',
 
-  // Layout
-  'flex',
-  'flex-row',
-  'shrink-0',
-
-  // Box
-  'min-w-0',
-  'h-auto',
-  'p-0',
-
-  // Theme
-  'bg-background',
-  'dark:bg-background-dark',
-];
-
-export const SidebarBar: string[] = [
-  // Position
-  'relative',
-
   // Layout
   'flex',
   'flex-col',
   'shrink-0',
-  'grow',
 
   // Box
   'min-h-0',
   'p-0',
-
-  // Theme
-  'text-on-background',
-  'dark:text-on-background-dark',
-
-  // Transition
-  'transition-[width]',
-];
-
-export const SidebarToolbar: string[] = [
-  // Position
-  'relative',
-
-  // Layout
-  'flex',
-  'flex-col',
-  'shrink-0',
-  'grow',
-  'overflow-auto',
-  'items-center',
-
-  // Sizing
-  'gap-md',
-
-  // Box
-  'min-h-0',
-  'min-w-xl',
-  'p-[6px]',
-  'pt-[56px]',
-  'pb-md+',
-
-  // Theme
-  'text-outline',
-  'dark:text-outline-dark',
 ];
 
-export const SidebarSides: Record<OrSidebarPlacement, string[]> = {
-  [OrSidebarPlacement.left]: [
-    // Borders
-    'border-r-[1px]',
-    'border-r-solid',
-    'border-r-outline-variant dark:border-r-outline-variant-dark',
-  ],
-  [OrSidebarPlacement.right]: [
-    // Borders
-    'border-l-[1px]',
-    'border-l-solid',
-    'border-l-outline-variant dark:border-l-outline-variant-dark',
-  ],
-};
-
-export const SidebarToolbarSides: Record<OrSidebarPlacement, string[]> = {
+export const SidebarRootSides: Record<OrSidebarPlacement, string[]> = {
   [OrSidebarPlacement.left]: [
     // Borders
     'border-r-[1px]',
     'border-r-solid',
-    'border-r-outline-variant dark:border-r-outline-variant-dark',
+    'border-r-secondary dark:border-r-secondary-dark',
   ],
   [OrSidebarPlacement.right]: [
     // Borders
     'border-l-[1px]',
     'border-l-solid',
-    'border-l-outline-variant dark:border-l-outline-variant-dark',
+    'border-l-secondary dark:border-l-secondary-dark',
   ],
 };
 
@@ -105,7 +36,7 @@ export const SidebarResize: string[] = [
   'z-[1]',
 
   // Box
-  'w-sm+',
+  'w-[12px]',
   'h-[100%]',
 
   // Cursor
@@ -119,7 +50,7 @@ export const SidebarResizeSides: Record<OrSidebarPlacement, string[]> = {
 
     // Borders
     'hover:border-r-2',
-    'hover:border-r-primary-hover hover:dark:border-r-primary-hover-dark',
+    'hover:border-r-primary hover:dark:border-r-primary-dark',
 
     // Transition
     'transition-[border-right]',
@@ -130,42 +61,23 @@ export const SidebarResizeSides: Record<OrSidebarPlacement, string[]> = {
 
     // Borders
     'hover:border-l-2',
-    'hover:border-l-primary-hover hover:dark:border-l-primary-hover-dark',
+    'hover:border-l-primary hover:dark:border-l-primary-dark',
 
     // Transition
     'transition-[border-left]',
   ],
 };
 
-export const SidebarCollapseButton: string[] = [
-  // Position
-  'absolute',
-  'top-md',
-  'inset-y-none',
-  'z-[1]',
-];
-
-export const SidebarCollapseButtonSides: Record<OrSidebarPlacement, string[]> = {
-  [OrSidebarPlacement.left]: [
-    // Position
-    '-right-[12px]',
-  ],
-  [OrSidebarPlacement.right]: [
-    // Position
-    '-left-[12px]',
-  ],
-};
-
 export const SidebarResizingSides: Record<OrSidebarPlacement, string[]> = {
   [OrSidebarPlacement.left]: [
     // Borders
     'border-r-2',
-    'border-r-primary-hover dark:border-r-primary-hover-dark',
+    'border-r-primary dark:border-r-primary-dark',
   ],
   [OrSidebarPlacement.right]: [
     // Borders
     'border-l-2',
-    'border-l-primary-hover dark:border-l-primary-hover-dark',
+    'border-l-primary dark:border-l-primary-dark',
   ],
 };
 
@@ -174,24 +86,14 @@ export const SidebarMain: string[] = [
   'flex',
   'flex-col',
   'grow',
-  'overflow-x-hidden',
 
   // Box
   'min-h-0',
 ];
 
 export const SidebarHeader: string[] = [
-  // Layout
-  'shrink-0',
-  'overflow-hidden',
-
   // Sizing
   'p-md',
-
-  // Typography
-  'typography-headline-2',
-  'whitespace-nowrap',
-  'text-ellipsis',
 ];
 
 export const SidebarContent: string[] = [
@@ -204,65 +106,11 @@ export const SidebarContent: string[] = [
 ];
 
 export const SidebarFooter: string[] = [
-  // Layout
-  'shrink-0',
-  'overflow-x-hidden',
-
   // Sizing
   'p-md',
 
   // Borders
   'border-t-[1px]',
   'border-t-solid',
-  'border-t-outline-variant dark:border-t-outline-variant-dark',
-];
-
-export const CollapseButtonContainer: string[] = [
-  // Box
-  'w-[24px]',
-  'h-[24px]',
-  'rounded-full',
-
-  // Theme
-  'text-primary dark:text-primary-dark',
-  'bg-background dark:bg-background-dark',
-];
-
-export const CollapseButton: string[] = [
-  // Box
-  'w-[24px]',
-  'h-[24px]',
-
-  // Typography
-  '!text-[16px]',
-
-  // Borders
-  '!border-[1px]',
-  '!border-solid',
-
-  // Theme
-  '!text-primary dark:!text-primary-dark',
-  '!bg-background dark:!bg-background-dark',
-  '!border-outline-variant dark:!border-outline-variant-dark',
-  '!outline-none',
-
-  // Theme (hover)
-  'hover:!text-primary hover:dark:!text-primary-dark',
-  'hover:!bg-primary-opacity-0-08 dark:hover:!bg-primary-opacity-0-08-dark',
-  'hover:!border-outline dark:hover:!border-outline-dark',
-
-  // Theme (active)
-  'active:!text-primary active:dark:!text-primary-dark',
-  'active:!bg-primary-opacity-0-12 dark:active:!bg-primary-opacity-0-12-dark',
-  'active:!border-primary dark:active:!border-primary-dark',
-
-  // Theme (focus)
-  'focus:!text-primary focus:dark:!text-primary-dark',
-  'focus:!bg-primary-opacity-0-12 dark:focus:!bg-primary-opacity-0-12-dark',
-  'focus:!border-outline dark:focus:!border-outline-dark',
-
-  // Theme (disabled)
-  'disabled:!text-on-disabled disabled:dark:!text-on-disabled-dark',
-  'disabled:!bg-background disabled:dark:!bg-background-dark',
-  'disabled:!border-outline-variant disabled:dark:!border-outline-variant-dark',
+  'border-t-secondary dark:border-t-secondary-dark',
 ];

package/src/components/or-skeleton-v3/OrSkeletonCircle.vue

@@ -1,30 +1,27 @@
 <template>
   <div
     ref="root"
-    v-bind="$attrs"
     :class="rootStyles"
     :style="rootStyle"
   />
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref } from 'vue-demi';
 import _ from 'lodash';
+import { computed, defineComponent, ref } from 'vue-demi';
 import { pxToRem } from '../../utils/functions/px-to-rem';
-import { useClassAttribute } from '../../hooks';
 import { SkeletonAnimated, SkeletonCircle, SkeletonRoot } from './styles';
 
 export default defineComponent({
   name: 'OrSkeletonCircle',
 
-  inheritAttrs: false,
-
   props: {
     animated: {
       type: Boolean,
       required: false,
       default: true,
     },
+
     size: {
       type: [Number, String],
       required: false,
@@ -41,15 +38,12 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-skeleton',
       'or-skeleton-circle',
       ...SkeletonRoot,
       ...SkeletonCircle,
       ...(props.animated ? SkeletonAnimated : []),
-      classAttribute.value,
     ]);
 
     const rootStyle = computed(() => {

package/src/components/or-skeleton-v3/OrSkeletonRect.vue

@@ -1,35 +1,33 @@
 <template>
   <div
     ref="root"
-    v-bind="$attrs"
     :class="rootStyles"
     :style="rootStyle"
   />
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref } from 'vue-demi';
 import _ from 'lodash';
+import { computed, defineComponent, ref } from 'vue-demi';
 import { pxToRem } from '../../utils/functions/px-to-rem';
-import { useClassAttribute } from '../../hooks';
 import { SkeletonAnimated, SkeletonRect, SkeletonRoot } from './styles';
 
 export default defineComponent({
   name: 'OrSkeletonRect',
 
-  inheritAttrs: false,
-
   props: {
     animated: {
       type: Boolean,
       required: false,
       default: true,
     },
+
     width: {
       type: [Number, String],
       required: false,
       default: '100%',
     },
+
     height: {
       type: [Number, String],
       required: false,
@@ -46,15 +44,12 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-skeleton',
       'or-skeleton-rect',
       ...SkeletonRoot,
       ...SkeletonRect,
       ...(props.animated ? SkeletonAnimated : []),
-      classAttribute.value,
     ]);
 
     const rootStyle = computed(() => {

package/src/components/or-skeleton-v3/OrSkeletonText.vue

@@ -1,7 +1,6 @@
 <template>
   <div
     ref="root"
-    v-bind="$attrs"
     :class="containerStyles"
     :style="containerStyle"
   >
@@ -15,38 +14,39 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref } from 'vue-demi';
 import _ from 'lodash';
+import { computed, defineComponent, ref } from 'vue-demi';
 import { pxToRem } from '../../utils/functions/px-to-rem';
-import { useClassAttribute } from '../../hooks';
 import { SkeletonAnimated, SkeletonRoot, SkeletonText, SkeletonTextContainerRoot } from './styles';
 
 export default defineComponent({
   name: 'OrSkeletonText',
 
-  inheritAttrs: false,
-
   props: {
     animated: {
       type: Boolean,
       required: false,
       default: true,
     },
+
     linesCount: {
       type: Number,
       required: false,
       default: 1,
     },
+
     width: {
       type: [Number, String],
       required: false,
       default: '100%',
     },
+
     fontSize: {
       type: Number,
       required: false,
       default: 16,
     },
+
     lineHeight: {
       type: Number,
       required: false,
@@ -63,12 +63,9 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const containerStyles = computed(() => [
       'or-skeleton-text-root',
       ...SkeletonTextContainerRoot,
-      classAttribute.value,
     ]);
 
     const containerStyle = computed(() => {
@@ -85,7 +82,6 @@ export default defineComponent({
       ...SkeletonRoot,
       ...SkeletonText,
       ...(props.animated ? SkeletonAnimated : []),
-      classAttribute.value,
     ]);
 
     const rowStyle = computed(() => {

package/src/components/or-sort-header-v3/OrSortHeader.stories3.ts

@@ -25,11 +25,7 @@ export default {
       control: { type: 'object' },
     },
 
-    value: { // TODO: Remove Vue 2 fallback
-      control: { type: 'object' },
-    },
-
-    inputValue: { // TODO: Rename to `value` after complete migration to Vue 3
+    value: {
       control: { type: 'text' },
     },
 
@@ -88,7 +84,6 @@ const Template: StoryFn<typeof OrSortHeader> = (args) => ({
       args,
       model,
       onUpdateModelValue: action('update:modelValue'),
-      onInput: action('input'),
       onFocus: action('focus'),
       onBlur: action('blur'),
     };
@@ -100,7 +95,6 @@ const Template: StoryFn<typeof OrSortHeader> = (args) => ({
         v-model="model"
         v-bind="args"
         @update:modelValue="onUpdateModelValue"
-        @input="onInput"
         @focus="onFocus"
         @blur="onBlur"
       >
@@ -109,9 +103,8 @@ const Template: StoryFn<typeof OrSortHeader> = (args) => ({
 
       <OrSortHeader
         v-model="model"
-        input-value="column-2"
+        value="column-2"
         @update:modelValue="onUpdateModelValue"
-        @input="onInput"
         @focus="onFocus"
         @blur="onBlur"
       >
@@ -128,5 +121,5 @@ Default.args = {
   default: 'Column 1',
 
   // Props
-  inputValue: 'column-1',
+  value: 'column-1',
 };

package/src/components/or-sort-header-v3/OrSortHeader.vue

@@ -1,7 +1,6 @@
 <template>
   <div
     ref="root"
-    v-bind="$attrs"
     :class="rootStyles"
     :activated="activated ? '' : null"
     @click.stop="toggleDirection()"
@@ -19,7 +18,6 @@
 
 <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';
@@ -31,7 +29,10 @@ export default defineComponent({
     OrIcon,
   },
 
-  inheritAttrs: false,
+  model: {
+    prop: 'modelValue',
+    event: 'update:modelValue',
+  },
 
   props: {
     modelValue: {
@@ -39,12 +40,7 @@ export default defineComponent({
       default: undefined,
     },
 
-    value: { // TODO: Remove Vue 2 fallback
-      type: Object as PropType<SortHeaderModel>,
-      default: undefined,
-    },
-
-    inputValue: { // TODO: Rename to `value` after complete migration to Vue 3
+    value: {
       type: String,
       required: true,
     },
@@ -53,7 +49,6 @@ export default defineComponent({
   emits: [
     'update:modelValue',
 
-    'input',
     'focus',
     'blur',
   ],
@@ -67,34 +62,28 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-sort-header',
       ...SortHeaderRoot,
-      classAttribute.value,
     ]);
 
     // State
     const proxyModelValue = computed({
-      get: () => {
-        return props.modelValue ?? props.value; // TODO: Remove Vue 2 fallback
-      },
+      get: () => props.modelValue,
 
       set: (value) => {
-        context.emit('input', value);
         context.emit('update:modelValue', value);
       },
     });
 
     const activated = computed(() => {
-      return proxyModelValue.value?.column === props.inputValue;
+      return proxyModelValue.value?.column === props.value;
     });
 
     // Methods
     function toggleDirection(): void {
       proxyModelValue.value = {
-        column: props.inputValue,
+        column: props.value,
         direction: proxyModelValue.value?.direction === 'asc' ? 'desc' : 'asc',
       };
     }

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

@@ -26,11 +26,7 @@ export default {
       control: { type: 'object' },
     },
 
-    value: { // TODO: Remove Vue 2 fallback
-      table: { disable: true },
-    },
-
-    inputValue: { // TODO: Rename to `value` after complete migration to Vue 3
+    value: {
       control: { type: 'text' },
     },
 
@@ -116,7 +112,6 @@ const Template: StoryFn<typeof OrSwitch> = (args) => ({
       args,
       model,
       onUpdateModelValue: action('update:modelValue'),
-      onInput: action('input'),
       onFocus: action('focus'),
       onBlur: action('blur'),
     };
@@ -128,7 +123,6 @@ const Template: StoryFn<typeof OrSwitch> = (args) => ({
         v-model="model"
         v-bind="args"
         @update:modelValue="onUpdateModelValue"
-        @input="onInput"
         @focus="onFocus"
         @blur="onBlur"
       >
@@ -139,10 +133,9 @@ const Template: StoryFn<typeof OrSwitch> = (args) => ({
 
       <OrSwitch
         v-model="model"
-        input-value="switch-2"
+        value="switch-2"
         label="Switch 2"
         @update:modelValue="onUpdateModelValue"
-        @input="onInput"
         @focus="onFocus"
         @blur="onBlur"
       />
@@ -157,6 +150,6 @@ Switch.args = {
   addon: '<OrIcon icon="info" />',
 
   // Props
-  inputValue: 'switch-1',
+  value: 'switch-1',
   label: 'Switch 1',
 };