@onereach/ui-components 4.11.1 → 4.11.3-beta.2972.0

package/src/components/or-card-collection-v3/OrCardCollection.vue

@@ -6,30 +6,11 @@
     <div :class="toolbarStyles">
       <div :class="toolbarPanelStyles">
         <template v-if="sortOptions.length">
-          <OrButton
-            ref="sortButton"
-            variant="link"
-            color="inherit"
-            @click="sortMenu.toggle()"
-          >
-            {{ sortLabel }}
-            <OrIcon
-              v-if="sortMenu"
-              :icon="sortMenu.isOpen ? 'arrow_drop_up' : 'arrow_drop_down'"
-            />
-          </OrButton>
-          <OrMenu
-            ref="sortMenu"
-            :trigger="sortButton && sortButton.root"
-          >
-            <OrMenuItem
-              v-for="sortItem in sortOptions"
-              :key="sortItem"
-              @click="handleSort(sortItem.value)"
-            >
-              {{ sortItem.label }}
-            </OrMenuItem>
-          </OrMenu>
+          <OrSorting
+            :sort="sort"
+            :options="sortOptions"
+            @change="$emit('sortChange', $event)"
+          />
         </template>
       </div>
       <div
@@ -40,7 +21,6 @@
           class="md:w-[350px]"
           :placeholder="searchPlaceholder"
           :debounce="searchDebounce"
-          size="s"
           @search="handleSearch"
         />
         <div class="layout-row gap-sm">
@@ -48,7 +28,9 @@
             <OrIconButton
               v-for="viewOption in viewModes"
               :key="viewOption.view"
-              :icon="{icon: viewOption.icon, variant: viewOption.view === proxyView ? 'filled' : 'outlined'}"
+              size="l"
+              :icon="{icon: viewOption.icon}"
+              :selected="viewOption.view === proxyView"
               @click="switchView(viewOption.view)"
             />
           </template>
@@ -95,16 +77,13 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref, watch } from 'vue-demi';
-import { OrButtonV3 as OrButton } from '../or-button-v3';
 import { OrIconButtonV3 as OrIconButton } from '../or-icon-button-v3';
-import { OrIconV3 as OrIcon } from '../or-icon-v3';
-import { OrMenuItemV3 as OrMenuItem } from '../or-menu-item-v3';
-import { OrMenuV3 as OrMenu } from '../or-menu-v3';
 import { OrSearchV3 as OrSearch } from '../or-search-v3';
 import OrCardCollectionView from './partials/OrCardCollectionView.vue3.vue';
+import { OrSortingV3 as OrSorting, SortOption } from '../or-sorting-v3';
 import { defaultViewModes, gridView } from './props';
 import { CardCollectionRoot, CardCollectionToolbar, CardCollectionToolbarPanel } from './styles';
-import { CardCollectionItem, SortOption, ViewMode } from './types';
+import { CardCollectionItem, ViewMode } from './types';
 
 export default defineComponent({
   name: 'OrCardCollection',
@@ -112,10 +91,7 @@ export default defineComponent({
   components: {
     OrCardCollectionView,
     OrIconButton,
-    OrButton,
-    OrMenu,
-    OrMenuItem,
-    OrIcon,
+    OrSorting,
     OrSearch,
   },
 
@@ -174,8 +150,6 @@ export default defineComponent({
   setup(props, context) {
     // Refs
     const root = ref<HTMLElement>();
-    const sortMenu = ref<typeof OrMenu>();
-    const sortButton = ref<typeof OrButton>();
 
     // Styles
     const rootStyles = computed(() => [
@@ -197,16 +171,12 @@ export default defineComponent({
 
     // State
     const proxyView = ref(props.view);
-    const proxySort = ref(props.sort);
     const proxySearch = ref(props.search);
 
     // Methods
     function switchView(view: string): void {
       proxyView.value = view;
     }
-    function handleSort(sort: string) {
-      proxySort.value = sort;
-    }
 
     function handleSearch(search: string) {
       proxySearch.value = search;
@@ -221,14 +191,6 @@ export default defineComponent({
       context.emit('viewChange', value);
     });
 
-    watch(() => props.sort, (value) => {
-      proxySort.value = value;
-    });
-
-    watch(proxySort, (value) => {
-      context.emit('sortChange', value);
-    });
-
     watch(() => props.search, (value) => {
       proxySearch.value = value;
     });
@@ -239,17 +201,13 @@ export default defineComponent({
 
     return {
       root,
-      sortMenu,
-      sortButton,
       rootStyles,
       toolbarStyles,
       toolbarPanelStyles,
       proxyView,
-      proxySort,
       proxySearch,
       sortLabel,
       switchView,
-      handleSort,
       handleSearch,
     };
   },

package/src/components/or-card-collection-v3/styles.ts

@@ -7,9 +7,6 @@ export const CardCollectionRoot: string[] = [
   // Spacing
   'gap-md',
   'max-h-full',
-
-  // Overflow
-  'overflow-hidden',
 ];
 
 export const CardCollectionToolbar: string[] = [
@@ -40,16 +37,17 @@ export const CardCollectionContent: string[] = [
   'gap-sm md:gap-md',
 
   // Overflow
-  'overflow-auto',
+  'overflow-y-auto',
+  'p-xs*',
+  '-m-xs*',
+  // '-mr-sm*',
 ];
 
 export const CardCollectionContentViews: Record<DefaultCardCollectionViews, string[]> = {
   'grid': [
     // Layout
-    'sm:grid-cols-1',
-    'md:grid-cols-2',
-    'lg:grid-cols-4',
-    'xl:grid-cols-6',
+    'grid-cols-1',
+    'md:grid-cols-5',
   ],
 
   'list': [

package/src/components/or-card-collection-v3/types.ts

@@ -7,8 +7,3 @@ export interface ViewMode {
   view: string;
   icon: string;
 }
-
-export interface SortOption {
-  label: string;
-  value: string;
-}

package/src/components/or-fab-v3/OrFab.vue

@@ -33,7 +33,7 @@ export default defineComponent({
     },
 
     color: {
-      type: String as PropType<FabColor>,
+      type: String as PropType<`${FabColor}`>,
       default: FabColor.Primary,
     },
 

package/src/components/or-icon-button-v3/OrIconButton.vue

@@ -3,7 +3,7 @@
     <button
       ref="root"
       v-bind="$attrs"
-      :class="rootStyles"
+      :class="[rootStyles, ...additionalStyles]"
       :type="'button'"
       :selected="selected ? '' : null"
       :disabled="disabled"
@@ -41,6 +41,12 @@ export default defineComponent({
   inheritAttrs: false,
 
   props: {
+    // TODO: Remove after migration to Vue 3
+    additionalStyles: {
+      type: Array as PropType<string[]>,
+      default: () => [],
+    },
+
     icon: {
       type: [String, Object] as PropType<string | Omit<InstanceType<typeof OrIcon>['$props'], 'size'>>,
       required: true,

package/src/components/or-menu-item-v3/styles.ts

@@ -27,4 +27,8 @@ export const MenuItemRoot: string[] = [
   // Theme (hover)
   'hover:theme-foreground-default',
   'dark:hover:theme-foreground-default-dark',
+
+
+  // Typography (selected)
+  'selected:text-on-background dark:selected:text-on-background-dark',
 ];

package/src/components/or-sidebar-v3/OrSidebar.vue

@@ -18,12 +18,15 @@
         ref="resizeBar"
         :class="resizeStyles"
       />
-      <or-sidebar-collapse-button
-        v-if="collapsible"
-        v-model="isCollapsed"
-        :class="collapsibleButtonStyles"
-        :side="side"
-      />
+
+      <template v-if="collapsible">
+        <OrSidebarCollapseButton
+          v-model="isCollapsed"
+          :class="collapsibleButtonStyles"
+          :side="side"
+        />
+      </template>
+
       <div
         v-show="!isCollapsed"
         :class="mainStyles"
@@ -57,7 +60,7 @@
 
 <script lang="ts">
 import { useDraggable, useElementBounding } from '@vueuse/core';
-import { computed, defineComponent, PropType, ref, useSlots, watch } from 'vue-demi';
+import { PropType, computed, defineComponent, ref, useSlots, watch } from 'vue-demi';
 import { OrSidebarCollapseButton } from './partials';
 import { OrSidebarPlacement } from './props';
 import { CollapsibleSidebarToolbar, SidebarBar, SidebarCollapseButton, SidebarCollapseButtonSides, SidebarContent, SidebarFooter, SidebarHeader, SidebarMain, SidebarResize, SidebarResizeSides, SidebarResizingSides, SidebarRoot, SidebarSides, SidebarToolbar, SidebarToolbarSides } from './styles';
@@ -74,14 +77,17 @@ export default defineComponent({
       type: Number,
       default: 320,
     },
+
     minimumWidth: {
       type: Number,
       default: 256,
     },
+
     maximumWidth: {
       type: Number,
       default: 384,
     },
+
     /**
      * User may put the component on the right or the left side of a container.
      * This property mirrors the resizing behavior (drag direction) and styling (horizontal border) of the sidebar.
@@ -90,13 +96,15 @@ export default defineComponent({
      * @values left, right
      */
     side: {
-      type: String as PropType<OrSidebarPlacement>,
-      default: OrSidebarPlacement.right,
+      type: String as PropType<`${OrSidebarPlacement}`>,
+      default: OrSidebarPlacement.Right,
     },
+
     draggable: {
       type: Boolean,
       default: true,
     },
+
     collapsible: {
       type: Boolean,
       default: false,
@@ -115,7 +123,7 @@ export default defineComponent({
     'close',
   ],
 
-  setup(props, { emit }) {
+  setup(props, context) {
     // Refs
     const root = ref<HTMLElement>();
     const resizeBar = ref<HTMLElement | null>(null);
@@ -184,7 +192,7 @@ export default defineComponent({
         isResizing.value = true;
       },
       onMove: (position => {
-        const delta = (position.x - startPositionX.value) * (props.side === OrSidebarPlacement.left ? -1 : 1);
+        const delta = (position.x - startPositionX.value) * (props.side === OrSidebarPlacement.Left ? -1 : 1);
         const newWidth = localWidth.value - delta;
         localWidth.value = newWidth > maximumWidth.value ? maximumWidth.value :
           newWidth < props.minimumWidth ? props.minimumWidth : newWidth;
@@ -231,9 +239,9 @@ export default defineComponent({
       if (newMaximum < localWidth.value) localWidth.value = newMaximum;
     });
 
-    watch(localWidth, (val: number) => emit('change:width', val));
+    watch(localWidth, (val: number) => context.emit('change:width', val));
 
-    watch(isCollapsed, (val: boolean) => emit(val ? 'close' : 'open'));
+    watch(isCollapsed, (val: boolean) => context.emit(val ? 'close' : 'open'));
 
     return {
       root,

package/src/components/or-sidebar-v3/partials/index.ts

@@ -1 +1 @@
-export * from './or-sidebar-collapse-button';
+export { default as OrSidebarCollapseButton } from './or-sidebar-collapse-button/OrSidebarCollapseButton.vue';

package/src/components/or-sidebar-v3/partials/or-sidebar-collapse-button/OrSidebarCollapseButton.vue

@@ -3,11 +3,11 @@
     ref="root"
     :class="rootStyles"
   >
-    <or-icon-button
-      :class="buttonStyles"
+    <OrIconButton
+      :additional-styles="buttonStyles"
       :icon="{ icon, size: 'inherit' }"
-      color="inherit"
-      @click="$emit('update:modelValue', !modelValue)"
+      :color="'inherit'"
+      @click.stop="$emit('update:modelValue', !modelValue)"
     />
   </div>
 </template>
@@ -16,7 +16,7 @@
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
 import { OrIconButtonV3 as OrIconButton } from '../../../or-icon-button-v3';
 import { OrSidebarPlacement } from '../../props';
-import { CollapseButton, CollapseButtonContainer } from './styles';
+import { CollapseButton, CollapseButtonButton } from './styles';
 
 export default defineComponent({
   name: 'OrSidebarCollapseButton',
@@ -38,15 +38,20 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+
     side: {
       type: String as PropType<OrSidebarPlacement>,
-      default: OrSidebarPlacement.right,
+      default: OrSidebarPlacement.Right,
     },
   },
 
-  emits: ['update:modelValue'],
+  emits: [
+    'update:modelValue',
+  ],
 
-  expose: ['root'],
+  expose: [
+    'root',
+  ],
 
   setup(props) {
     // Refs
@@ -54,17 +59,19 @@ export default defineComponent({
 
     const rootStyles = computed(() => [
       'or-sidebar-collapse-button-v3',
-      ...CollapseButtonContainer,
+      ...CollapseButton,
     ]);
 
     const buttonStyles = computed(() => [
-      ...CollapseButton,
+      ...CollapseButtonButton,
     ]);
 
-    const icon = computed(() => (props.side === OrSidebarPlacement.left !== props.modelValue) ?
-      'keyboard_arrow_left' :
-      'keyboard_arrow_right',
-    );
+    // State
+    const icon = computed(() => {
+      return props.side === OrSidebarPlacement.Left !== props.modelValue
+        ? 'keyboard_arrow_left'
+        : 'keyboard_arrow_right';
+    });
 
     return {
       root,

package/src/components/or-sidebar-v3/partials/or-sidebar-collapse-button/styles.ts

@@ -1,4 +1,4 @@
-export const CollapseButtonContainer: string[] = [
+export const CollapseButton: string[] = [
   // Box
   'w-[24px]',
   'h-[24px]',
@@ -9,7 +9,7 @@ export const CollapseButtonContainer: string[] = [
   'bg-background dark:bg-background-dark',
 ];
 
-export const CollapseButton: string[] = [
+export const CollapseButtonButton: string[] = [
   // Box
   'w-[24px]',
   'h-[24px]',

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

@@ -1,4 +1,4 @@
 export enum OrSidebarPlacement {
-  left = 'left',
-  right = 'right',
+  Left = 'left',
+  Right = 'right',
 }

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

@@ -72,13 +72,14 @@ export const CollapsibleSidebarToolbar: string[] = [
 ];
 
 export const SidebarSides: Record<OrSidebarPlacement, string[]> = {
-  [OrSidebarPlacement.left]: [
+  'left': [
     // Borders
     'border-r-[1px]',
     'border-r-solid',
     'border-r-outline-variant dark:border-r-outline-variant-dark',
   ],
-  [OrSidebarPlacement.right]: [
+
+  'right': [
     // Borders
     'border-l-[1px]',
     'border-l-solid',
@@ -87,13 +88,14 @@ export const SidebarSides: Record<OrSidebarPlacement, string[]> = {
 };
 
 export const SidebarToolbarSides: Record<OrSidebarPlacement, string[]> = {
-  [OrSidebarPlacement.left]: [
+  'left': [
     // Borders
     'border-r-[1px]',
     'border-r-solid',
     'border-r-outline-variant dark:border-r-outline-variant-dark',
   ],
-  [OrSidebarPlacement.right]: [
+
+  'right': [
     // Borders
     'border-l-[1px]',
     'border-l-solid',
@@ -116,7 +118,7 @@ export const SidebarResize: string[] = [
 ];
 
 export const SidebarResizeSides: Record<OrSidebarPlacement, string[]> = {
-  [OrSidebarPlacement.left]: [
+  'left': [
     // Position
     '-right-[1px]',
 
@@ -127,7 +129,8 @@ export const SidebarResizeSides: Record<OrSidebarPlacement, string[]> = {
     // Transition
     'transition-[border-right]',
   ],
-  [OrSidebarPlacement.right]: [
+
+  'right': [
     // Position
     '-left-[1px]',
 
@@ -149,23 +152,25 @@ export const SidebarCollapseButton: string[] = [
 ];
 
 export const SidebarCollapseButtonSides: Record<OrSidebarPlacement, string[]> = {
-  [OrSidebarPlacement.left]: [
+  'left': [
     // Position
     '-right-[12px]',
   ],
-  [OrSidebarPlacement.right]: [
+
+  'right': [
     // Position
     '-left-[12px]',
   ],
 };
 
 export const SidebarResizingSides: Record<OrSidebarPlacement, string[]> = {
-  [OrSidebarPlacement.left]: [
+  'left': [
     // Borders
     'border-r-2',
     'border-r-primary-hover dark:border-r-primary-hover-dark',
   ],
-  [OrSidebarPlacement.right]: [
+
+  'right': [
     // Borders
     'border-l-2',
     'border-l-primary-hover dark:border-l-primary-hover-dark',

package/src/components/or-sorting-v3/OrSortingV3.vue

@@ -0,0 +1,95 @@
+<template>
+  <div>
+    <OrButton
+      ref="sortButton"
+      variant="link"
+      color="inherit"
+      @click="sortMenu.toggle()"
+    >
+      {{ sortLabel }}
+      <OrIcon
+        v-if="sortMenu"
+        :icon="sortMenu.state === 'open' ? 'arrow_drop_up' : 'arrow_drop_down'"
+      />
+    </OrButton>
+    <OrMenu
+      ref="sortMenu"
+      :trigger="sortButton && sortButton.root"
+      placement="bottom-start"
+    >
+      <OrMenuItem
+        v-for="item in options"
+        :key="item.value"
+        :selected="item.value === proxySort"
+        @click="handleSort(item.value)"
+      >
+        {{ item.label }}
+      </OrMenuItem>
+    </OrMenu>
+  </div>
+</template>
+<script lang="ts">
+import { defineComponent, ref, PropType, computed, watch } from 'vue-demi';
+import { OrMenuV3 as OrMenu } from '../or-menu-v3';
+import { OrMenuItemV3 as OrMenuItem } from '../or-menu-item-v3';
+import { OrButtonV3 as OrButton } from '../or-button-v3';
+import { OrIconV3 as OrIcon } from '../or-icon-v3';
+import { SortOption } from './types';
+
+export default defineComponent({
+  name: 'OrSorting',
+  components: {
+    OrMenu,
+    OrMenuItem,
+    OrButton,
+    OrIcon,
+  },
+  props: {
+    sort: {
+      type: String,
+      default: undefined,
+    },
+    options: {
+      type: Array as PropType<SortOption[]>,
+      default: () => [],
+    },
+  },
+  emits: [
+    'change',
+  ],
+  setup(props, context) {
+    // Refs
+    const sortMenu = ref<typeof OrMenu>();
+    const sortButton = ref<typeof OrButton>();
+
+    // State
+    const proxySort = ref(props.sort);
+    const sortLabel = computed(() => {
+      return props.options.find(item => item.value === props.sort)?.label;
+    });
+
+    // Methods
+    function handleSort(sort: string) {
+      proxySort.value = sort;
+    }
+
+    // Effects
+    watch(() => props.sort, (value) => {
+      proxySort.value = value;
+    });
+
+    watch(proxySort, (value) => {
+      context.emit('change', value);
+    });
+
+    return {
+      sortMenu,
+      sortButton,
+      sortLabel,
+      proxySort,
+      handleSort,
+    };
+  },
+});
+
+</script>

package/src/components/or-sorting-v3/index.ts

@@ -0,0 +1,2 @@
+export { default as OrSortingV3 } from './OrSortingV3.vue';
+export * from './types';

package/src/components/or-sorting-v3/types.ts

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

package/dist/esm/v2/components/or-sidebar-v3/partials/or-sidebar-collapse-button/index.d.ts

@@ -1 +0,0 @@
-export { default as OrSidebarCollapseButton } from './OrSidebarCollapseButton.vue';

package/dist/esm/v2/components/or-sidebar-v3/partials/or-sidebar-collapse-button/index.js

@@ -1,18 +0,0 @@
-export { _ as OrSidebarCollapseButton } from '../../../../OrSidebarCollapseButton-49da331a.js';
-import 'vue-demi';
-import '../../../../OrIconButton-2ab8fa02.js';
-import '../../../../OrIcon-d35a84d8.js';
-import '../../../../normalize-component-6e8e3d80.js';
-import '../../../../OrTooltip-a32c182a.js';
-import '@vueuse/core';
-import '../../../../usePopoverState-b92c698b.js';
-import '@onereach/styles/tailwind.config';
-import 'tailwindcss/resolveConfig';
-import '../../../../OrPopover-71380b24.js';
-import '@floating-ui/dom';
-import '../../../../useElevation-a50ec347.js';
-import '../../../../useResponsive-a02e95b7.js';
-import '../../../../OrBottomSheet-6bc632c4.js';
-import '../../../../OrOverlay-948346df.js';
-import '../../../../OrTeleport.vue2-424c7f33.js';
-import 'portal-vue';

package/dist/esm/v3/components/or-sidebar-v3/partials/or-sidebar-collapse-button/index.d.ts

@@ -1 +0,0 @@
-export { default as OrSidebarCollapseButton } from './OrSidebarCollapseButton.vue';

package/dist/esm/v3/components/or-sidebar-v3/partials/or-sidebar-collapse-button/index.js

@@ -1,17 +0,0 @@
-export { s as OrSidebarCollapseButton } from '../../../../OrSidebarCollapseButton-86dafbbc.js';
-import 'vue-demi';
-import '../../../../OrIconButton-00f8f0c7.js';
-import '../../../../OrIcon-62793572.js';
-import 'vue';
-import '../../../../OrTooltip-d7d40e38.js';
-import '@vueuse/core';
-import '../../../../usePopoverState-b92c698b.js';
-import '@onereach/styles/tailwind.config';
-import 'tailwindcss/resolveConfig';
-import '../../../../OrPopover-94dc1203.js';
-import '@floating-ui/dom';
-import '../../../../useElevation-a50ec347.js';
-import '../../../../useResponsive-a02e95b7.js';
-import '../../../../OrBottomSheet-79db2626.js';
-import '../../../../OrOverlay-489fdf76.js';
-import '../../../../OrTeleport.vue3-8099178c.js';