@onereach/ui-components 2.70.2-beta.2198.0 → 2.70.2-beta.2199.0

package/src/components/or-radio-v3/OrRadio.vue

@@ -1,12 +1,13 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
   >
     <input
-      v-bind="$attrs"
-      :id="controlId"
+      ref="control"
       v-model="proxyModelValue"
+      v-bind="controlAttributes"
       :class="controlStyles"
       type="radio"
       :value="inputValue"
@@ -18,7 +19,7 @@
 
     <template v-if="$slots.default || label">
       <OrLabel
-        :control-id="controlId"
+        :control-id="controlAttributes.id"
         :variant="labelVariant"
         :required="required"
         :disabled="disabled"
@@ -34,8 +35,8 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, getCurrentInstance, PropType, ref } from 'vue-demi';
-import { useClassAttribute } from '../../hooks';
+import { computed, defineComponent, PropType, reactive, ref } from 'vue-demi';
+import { useClassAttribute, useControlAttributes, useIdAttribute } from '../../hooks';
 import { LabelVariant, OrLabelV3 as OrLabel } from '../or-label-v3';
 import { RadioControl, RadioControlHandle, RadioRoot } from './styles';
 
@@ -95,13 +96,15 @@ export default defineComponent({
 
   expose: [
     'root',
+
+    'focus',
+    'blur',
   ],
 
   setup(props, context) {
-    const currentInstance = getCurrentInstance()!;
-
     // Refs
     const root = ref<HTMLElement>();
+    const control = ref<HTMLInputElement>();
 
     // Styles
     const classAttribute = useClassAttribute();
@@ -118,7 +121,10 @@ export default defineComponent({
     ]);
 
     // State
-    const controlId = ref(context.attrs.id as string ?? currentInstance.uid.toString());
+    const controlAttributes = reactive({
+      id: useIdAttribute(),
+      ...useControlAttributes(),
+    });
 
     const proxyModelValue = computed({
       get: () => {
@@ -131,12 +137,24 @@ export default defineComponent({
       },
     });
 
+    // Methods
+    function focus(): void {
+      control.value?.focus();
+    }
+
+    function blur(): void {
+      control.value?.blur();
+    }
+
     return {
       root,
+      control,
       rootStyles,
       controlStyles,
-      controlId,
+      controlAttributes,
       proxyModelValue,
+      focus,
+      blur,
     };
   },
 });

package/src/components/or-sidebar-v3/OrSidebar.docs.mdx

@@ -5,9 +5,3 @@ import { OrSidebarV3 as OrSidebar } from '@onereach/ui-components';
 ```
 
 <DocsPage />
-
-## Migration Guide from V1
-  - added property `draggable`
-  - added property `maximumWidth`
-  - added property `collapsible`
-  - added slot `toolbar`

package/src/components/or-sidebar-v3/OrSidebar.stories3.ts

@@ -3,11 +3,8 @@ import OrSidebarDocs from './OrSidebar.docs.mdx';
 import OrSidebar from './OrSidebar.vue';
 import { OrSidebarPlacement } from './props';
 import { action } from '@storybook/addon-actions';
-import { ref } from 'vue-demi';
 import * as Faker from 'faker';
 import { OrButtonV3 as OrButton } from '../or-button-v3';
-import { OrIconButtonV3 as OrIconButton } from '../or-icon-button-v3';
-import { OrTabsV3 as OrTabs, TabsItem } from '../or-tabs-v3';
 
 export default {
   title: 'Components/Sidebar',
@@ -42,15 +39,6 @@ export default {
       control: { type: 'text' },
     },
 
-    toolbar: {
-      type: {
-        name: 'string',
-        required: false,
-      },
-
-      control: { type: 'text' },
-    },
-
     // Props
     width: {
       control: { type: 'number' },
@@ -64,14 +52,6 @@ export default {
       control: { type: 'select' },
       options: Object.values(OrSidebarPlacement),
     },
-
-    draggable: {
-      control: { type: 'boolean' },
-    },
-
-    collapsible: {
-      control: { type: 'boolean' },
-    },
   },
 
   parameters: {
@@ -87,7 +67,6 @@ const DefaultTemplate: StoryFn<typeof OrSidebar> = (args) => ({
   components: {
     OrSidebar,
     OrButton,
-    OrIconButton,
   },
 
   setup() {
@@ -99,9 +78,9 @@ const DefaultTemplate: StoryFn<typeof OrSidebar> = (args) => ({
   },
 
   template: `
-    <div style="display: flex; flex-direction: row; border: 1px solid gray; max-height: 750px">
+    <div style="display: flex; flex-direction: row; border: 1px solid gray; max-height: 500px">
       <div style="flex-grow: 1; overflow: auto">
-        ${Faker.lorem.paragraphs(10)}
+        ${Faker.lorem.paragraphs(3)}
       </div>
       <OrSidebar v-bind="args" @change:width="onChangeWidth">
           <template v-if="${!!args.header}" v-slot:header>
@@ -113,9 +92,6 @@ const DefaultTemplate: StoryFn<typeof OrSidebar> = (args) => ({
           <template v-if="${!!args.footer}" v-slot:footer>
             ${args.footer}
           </template>
-          <template v-if="${!!args.toolbar}" v-slot:toolbar>
-            ${args.toolbar}
-          </template>
       </OrSidebar>
     </div>
   `,
@@ -125,7 +101,6 @@ const LeftTemplate: StoryFn<typeof OrSidebar> = (args) => ({
   components: {
     OrSidebar,
     OrButton,
-    OrIconButton,
   },
 
   setup() {
@@ -137,7 +112,7 @@ const LeftTemplate: StoryFn<typeof OrSidebar> = (args) => ({
   },
 
   template: `
-    <div style="display: flex; flex-direction: row; border: 1px solid gray; max-height: 750px">
+    <div style="display: flex; flex-direction: row; border: 1px solid gray; max-height: 500px">
       <OrSidebar v-bind="args" @change:width="onChangeWidth">
           <template v-if="${!!args.header}" v-slot:header>
             ${args.header}
@@ -148,137 +123,14 @@ const LeftTemplate: StoryFn<typeof OrSidebar> = (args) => ({
           <template v-if="${!!args.footer}" v-slot:footer>
             ${args.footer}
           </template>
-          <template v-if="${!!args.toolbar}" v-slot:toolbar>
-            ${args.toolbar}
-          </template>
       </OrSidebar>
       <div style="flex-grow: 1; overflow: auto">
-        ${Faker.lorem.paragraphs(10)}
+        ${Faker.lorem.paragraphs(3)}
       </div>
     </div>
   `,
 });
 
-const TabsTemplate: StoryFn<typeof OrSidebar> = (args) => ({
-  components: {
-    OrSidebar,
-    OrButton,
-    OrIconButton,
-    OrTabs,
-  },
-
-  setup() {
-    // State
-    const model = ref<string>();
-
-    return {
-      args,
-      model,
-    };
-  },
-
-  methods: {
-    onChangeWidth: action('change:width'),
-  },
-
-  template: `
-    <div style="display: flex; flex-direction: row; border: 1px solid gray; max-height: 750px">
-      <div style="flex-grow: 1; overflow: auto">
-        ${Faker.lorem.paragraphs(10)}
-      </div>
-      <OrSidebar v-bind="args" @change:width="onChangeWidth">
-          <template v-if="${!!args.header}" v-slot:header>
-            ${args.header}
-          </template>
-          <template v-if="${!!args.default}" v-slot:default>
-            ${args.default}
-          </template>
-          <template v-else v-slot:default>
-            <or-tabs
-              v-model="model"
-              :items="args.items"
-            >
-              <template v-for="item in args.items" #[item.value]>
-                {{ item.label }} Content
-                ${Faker.lorem.paragraphs(3)}
-              </template>
-            </or-tabs>
-          </template>
-          <template v-if="${!!args.footer}" v-slot:footer>
-            ${args.footer}
-          </template>
-          <template v-if="${!!args.toolbar}" v-slot:toolbar>
-            ${args.toolbar}
-          </template>
-      </OrSidebar>
-    </div>
-  `,
-});
-
-const longToolbar = `
-  <or-icon-button
-    icon="refresh"
-    color="inherit"
-  />
-  <hr class="w-full border-outline-variant dark:border-outline-variant-dark" />
-  <or-icon-button
-    icon="add"
-    color="inherit"
-  />
-  <or-icon-button
-    icon="zoom_out_map"
-    color="inherit"
-  />
-  <or-icon-button
-    icon="remove"
-    color="inherit"
-  />
-  <hr class="w-full border-outline-variant dark:border-outline-variant-dark" />
-  <or-icon-button
-    icon="description"
-    color="inherit"
-  />
-  <or-icon-button
-    icon="tab_unselected"
-    color="inherit"
-  />
-  <hr class="w-full border-outline-variant dark:border-outline-variant-dark" />
-  <or-icon-button
-    icon="create_new_folder"
-    color="inherit"
-  />
-  <or-icon-button
-    icon="content_paste"
-    color="inherit"
-  />
-  <or-icon-button
-    icon="location_on"
-    color="inherit"
-  />
-  <or-icon-button
-    icon="copy_all"
-    color="inherit"
-  />
-  <or-icon-button
-    icon="call_split"
-    color="inherit"
-  />
-  <hr class="w-full border-outline-variant dark:border-outline-variant-dark" />
-  <or-icon-button
-    icon="sell"
-    color="inherit"
-  />
-  <div class="mt-auto" />
-  <or-icon-button
-    icon="terminal"
-    color="inherit"
-  />
-  <or-icon-button
-    icon="delete"
-    color="inherit"
-  />
-`;
-
 export const Default = DefaultTemplate.bind({});
 Default.args = {
   header: 'Header',
@@ -286,24 +138,11 @@ Default.args = {
   footer: 'Footer',
 };
 
-export const WithCustomWidthConstraints = DefaultTemplate.bind({});
-WithCustomWidthConstraints.args = {
+export const WithMinimumWidth = DefaultTemplate.bind({});
+WithMinimumWidth.args = {
   ...Default.args,
   width: 250,
   minimumWidth: 200,
-  maximumWidth: 500,
-};
-
-export const NotDraggable = DefaultTemplate.bind({});
-NotDraggable.args = {
-  ...Default.args,
-  draggable: false,
-};
-
-export const Collapsible = DefaultTemplate.bind({});
-Collapsible.args = {
-  ...Default.args,
-  collapsible: true,
 };
 
 export const OnlyContent = DefaultTemplate.bind({});
@@ -328,60 +167,8 @@ WithFooter.args = {
   `,
 };
 
-export const WithToolbar = DefaultTemplate.bind({});
-WithToolbar.args = {
-  ...OnlyContent.args,
-  toolbar: longToolbar,
-};
-
-export const CollapsibleWithToolbar = DefaultTemplate.bind({});
-CollapsibleWithToolbar.args = {
-  ...WithToolbar.args,
-  collapsible: true,
-};
-
-export const WithTabs = TabsTemplate.bind({});
-WithTabs.args = {
-  minimumWidth: 352,
-  header: 'Headline',
-  items: Array.from<string, TabsItem>([
-    'Alfa',
-    'Bravo',
-    'Charlie',
-    'Delta',
-    'Echo',
-    'Foxtrot',
-    'Golf',
-    'Hotel',
-    'India',
-    'Juliett',
-  ], (item) => ({
-    value: item.toLowerCase(),
-    label: item,
-  })),
-  footer: `
-    <div style="display: flex; flex-direction: row; justify-content: end; gap: 16px">
-        <or-button color="danger" variant="outlined">Delete</or-button>
-        <or-button variant="outlined" class="ml-auto">Cancel</or-button>
-        <or-button>Save</or-button>
-    </div>
-  `,
-};
-
 export const LeftSidebar = LeftTemplate.bind({});
 LeftSidebar.args = {
   ...Default.args,
   side: 'left',
 };
-
-export const WithLeftToolbar = LeftTemplate.bind({});
-WithLeftToolbar.args = {
-  ...LeftSidebar.args,
-  toolbar: longToolbar,
-};
-
-export const CollapsibleWithWithLeftToolbar = LeftTemplate.bind({});
-CollapsibleWithWithLeftToolbar.args = {
-  ...WithLeftToolbar.args,
-  collapsible: true,
-};

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

@@ -2,55 +2,28 @@
   <aside
     ref="root"
     :class="rootStyles"
+    :style="sidebarStyle"
   >
     <div
-      v-if="side === 'right' && isShowingToolbar"
-      :class="toolbarStyles"
-    >
-      <slot name="toolbar" />
-    </div>
-    <div
-      :class="sidebarStyles"
-      :style="sidebarStyle"
-    >
+      ref="resizeBar"
+      :class="resizeStyles"
+    />
+    <div :class="mainStyles">
       <div
-        v-if="draggable && !isCollapsed"
-        ref="resizeBar"
-        :class="resizeStyles"
-      />
-      <or-sidebar-collapse-button
-        v-if="collapsible"
-        v-model="isCollapsed"
-        :class="collapsibleButtonStyles"
-        :side="side"
-      />
-      <div
-        v-show="!isCollapsed"
-        :class="mainStyles"
+        v-if="$slots.header"
+        :class="headerStyles"
       >
-        <div
-          v-if="$slots.header"
-          :class="headerStyles"
-        >
-          <slot name="header" />
-        </div>
-        <div :class="contentStyles">
-          <slot />
-        </div>
+        <slot name="header" />
       </div>
-      <div
-        v-if="$slots.footer"
-        v-show="!isCollapsed"
-        :class="footerStyles"
-      >
-        <slot name="footer" />
+      <div :class="contentStyles">
+        <slot />
       </div>
     </div>
     <div
-      v-if="side === 'left' && isShowingToolbar"
-      :class="toolbarStyles"
+      v-if="$slots.footer"
+      :class="footerStyles"
     >
-      <slot name="toolbar" />
+      <slot name="footer" />
     </div>
   </aside>
 </template>
@@ -58,47 +31,34 @@
 <script lang="ts">
 import { useDraggable, useElementBounding } from '@vueuse/core';
 import _ from 'lodash';
-import { computed, defineComponent, PropType, ref, watch, useSlots } from 'vue-demi';
+import { computed, defineComponent, PropType, ref, watch } from 'vue-demi';
 import { OrSidebarPlacement } from './props';
 import {
   SidebarRoot,
-  SidebarBar,
-  SidebarToolbar,
-  SidebarSides,
-  SidebarToolbarSides,
+  SidebarRootSides,
   SidebarResize,
   SidebarResizeSides,
-  SidebarCollapseButton,
-  SidebarCollapseButtonSides,
   SidebarResizingSides,
   SidebarMain,
   SidebarHeader,
   SidebarContent,
   SidebarFooter,
 } from './styles';
-import OrSidebarCollapseButton from './OrSidebarCollapseButton.vue';
 
 export default defineComponent({
   name: 'OrSidebar',
 
-  components: {
-    OrSidebarCollapseButton,
-  },
-
   props: {
     width: {
       type: Number,
-      default: 320,
+      required: false,
+      default: 0,
       validator: (value?: any) => _.isNumber(value) && value >= 0,
     },
     minimumWidth: {
       type: Number,
-      default: 256,
-      validator: (value?: any) => _.isNumber(value) && value >= 0,
-    },
-    maximumWidth: {
-      type: Number,
-      default: 384,
+      required: false,
+      default: 350,
       validator: (value?: any) => _.isNumber(value) && value >= 0,
     },
     /**
@@ -113,24 +73,10 @@ export default defineComponent({
       default: OrSidebarPlacement.right,
       validator: (value?: any) => _.includes(_.values(OrSidebarPlacement), value),
     },
-    draggable: {
-      type: Boolean,
-      default: true,
-    },
-    collapsible: {
-      type: Boolean,
-      default: false,
-    },
   },
 
   emits: ['change:width'],
 
-  expose: [
-    'root',
-    'open',
-    'close',
-  ],
-
   setup(props, { emit }) {
     // Refs
     const root = ref<HTMLElement>();
@@ -138,36 +84,20 @@ export default defineComponent({
 
     const parentContainer = computed(() => root.value?.parentElement);
 
-    // Slots
-    const { toolbar: toolbarSlot } = useSlots();
-
     // State
     const startPositionX = ref(0);
     const isResizing = ref(false);
-    const isCollapsed = ref(false);
-    const maximumWidth = ref(props.maximumWidth || 384);
     const localWidth = ref(props.width >= props.minimumWidth ? props.width : props.minimumWidth);
 
-    const isShowingToolbar = computed(() => !!toolbarSlot);
-
     // Styles
     const sidebarStyle = computed(() => ({
-      width: (isCollapsed.value ? 16 : localWidth.value) + 'px',
+      width: localWidth.value + 'px',
     }));
 
     const rootStyles = computed(() => [
       'or-sidebar',
       ...SidebarRoot,
-    ]);
-
-    const sidebarStyles = computed(() => [
-      ...SidebarBar,
-      ...SidebarSides[props.side],
-    ]);
-
-    const toolbarStyles = computed(() => [
-      ...SidebarToolbar,
-      ...SidebarToolbarSides[props.side],
+      ...SidebarRootSides[props.side],
     ]);
 
     const resizeStyles = computed(() => [
@@ -176,11 +106,6 @@ export default defineComponent({
       ...(isResizing.value ? SidebarResizingSides[props.side] : []),
     ]);
 
-    const collapsibleButtonStyles = computed(() => [
-      ...SidebarCollapseButton,
-      ...SidebarCollapseButtonSides[props.side],
-    ]);
-
     const mainStyles = computed(() => [...SidebarMain]);
 
     const headerStyles = computed(() => [...SidebarHeader]);
@@ -212,16 +137,7 @@ export default defineComponent({
       },
     });
 
-    // Methods
-    function open(): void {
-      isCollapsed.value = false;
-    }
-
-    function close(): void {
-      isCollapsed.value = true;
-    }
-
-    const { width: containerWidth } = useElementBounding(parentContainer);
+    const { width: maximumWidth } = useElementBounding(parentContainer);
 
     watch(() => props.width, (newValue: number) => {
       if (newValue !== localWidth.value) {
@@ -234,14 +150,6 @@ export default defineComponent({
       if (newMinimum > localWidth.value) localWidth.value = newMinimum;
     });
 
-    watch(() => props.maximumWidth, (newMaximum: number) => {
-      if (newMaximum < maximumWidth.value) maximumWidth.value = newMaximum;
-    });
-
-    watch(containerWidth, (newMaximum: number) => {
-      if (newMaximum < maximumWidth.value) maximumWidth.value = newMaximum;
-    });
-
     watch(maximumWidth, (newMaximum: number) => {
       if (newMaximum < localWidth.value) localWidth.value = newMaximum;
     });
@@ -252,21 +160,14 @@ export default defineComponent({
       root,
       resizeBar,
       isResizing,
-      isCollapsed,
       localWidth,
-      isShowingToolbar,
       sidebarStyle,
       rootStyles,
-      sidebarStyles,
-      toolbarStyles,
       resizeStyles,
-      collapsibleButtonStyles,
       mainStyles,
       headerStyles,
       contentStyles,
       footerStyles,
-      open,
-      close,
     };
   },
 });