origam 0.3.10 → 2.3.0

package/dist/src/components/DataTable/OrigamDataTableGroupHeaderRow.vue

@@ -49,7 +49,7 @@
 
 <script setup>
 import { OrigamBtn, OrigamCheckboxBtn, OrigamDataTableColumnCell } from "../../components";
-import { useGroupBy, useHeaders, useProps, useSelection } from "../../composables";
+import { useGroupBy, useHeaders, useProps, useSelection, useStyle } from "../../composables";
 import { MDI_ICONS } from "../../enums";
 import { computed, StyleValue } from "vue";
 const props = defineProps({
@@ -66,11 +66,6 @@ const props = defineProps({
   class: { type: [String, Array, Object], required: false },
   style: { type: [String, Array, Object, Boolean, null], required: false, skipCheck: true },
   color: { type: [String, Boolean, null], required: false, skipCheck: true },
-  bgColor: { type: [String, Boolean, null], required: false, skipCheck: true },
-  activeColor: { type: [String, Boolean, null], required: false, skipCheck: true },
-  activeBgColor: { type: [String, Boolean, null], required: false, skipCheck: true },
-  hoverColor: { type: [String, Boolean, null], required: false, skipCheck: true },
-  hoverBgColor: { type: [String, Boolean, null], required: false, skipCheck: true },
   padding: { type: [Boolean, Number, String], required: false },
   paddingTop: { type: [Boolean, Number, String], required: false },
   paddingLeft: { type: [Boolean, Number, String], required: false },
@@ -130,13 +125,25 @@ const dataTableGroupHeaderRowStyles = computed(() => {
     props.style
   ];
 });
+const { id, css, load, isLoaded, unload } = useStyle(dataTableGroupHeaderRowStyles);
 defineExpose({
-  filterProps
+  filterProps,
+  css,
+  id,
+  load,
+  unload,
+  isLoaded
 });
 </script>
 
-<style>
-	:root {
+<style lang="scss" scoped>
+	.origam-data-table-group-header-row {
+		background-color: var(--origam-data-table-group-header-row---background-color, var(--origam-color__surface---overlay));
+		color: var(--origam-data-table-group-header-row---color, var(--origam-color__text---primary));
+		font-weight: var(--origam-data-table-group-header-row---font-weight, 500);
 
+		&__column {
+			padding-inline-start: calc(var(--origam-data-table-group-header-row--depth, 0) * var(--origam-data-table-group-header-row__column---padding-inline-start-factor, 16px));
+		}
 	}
 </style>

package/dist/src/components/DataTable/OrigamDataTableHeaderCell.vue

@@ -31,7 +31,7 @@
 					<div class="origam-data-table-header-cell__content">
 						<span>{{ column.title }}</span>
 
-						<template v-if="column.sortable && !props.disableSort">
+						<template v-if="column.sortable && !disableSort">
 							<origam-icon
 									key="icon"
 									:class="{'origam-data-table-header-cell__sort-icon--active': isSorted(column)}"
@@ -40,7 +40,7 @@
 							/>
 						</template>
 
-						<template v-if="props.multiSort && isSorted(column)">
+						<template v-if="multiSort && isSorted(column)">
 							<div
 									key="badge"
 									:style="colorStyles"
@@ -58,7 +58,15 @@
 
 <script setup>
 import { OrigamCheckboxBtn, OrigamDataTableColumnCell, OrigamIcon } from "../../components";
-import { useBothColor, useCell, useHeadersCell, useProps, useSelection, useSort } from "../../composables";
+import {
+  useBothColor,
+  useCell,
+  useHeadersCell,
+  useProps,
+  useSelection,
+  useSort,
+  useStyle
+} from "../../composables";
 import { convertToUnit } from "../../utils";
 import { computed, CSSProperties, mergeProps, toRef } from "vue";
 const props = defineProps({
@@ -74,19 +82,14 @@ const props = defineProps({
   multiSort: { type: Boolean, required: false },
   sortAscIcon: { type: null, required: false },
   sortDescIcon: { type: null, required: false },
-  color: { type: [String, Boolean, null], required: false, skipCheck: true },
-  bgColor: { type: [String, Boolean, null], required: false, skipCheck: true },
-  activeColor: { type: [String, Boolean, null], required: false, skipCheck: true },
-  activeBgColor: { type: [String, Boolean, null], required: false, skipCheck: true },
-  hoverColor: { type: [String, Boolean, null], required: false, skipCheck: true },
-  hoverBgColor: { type: [String, Boolean, null], required: false, skipCheck: true }
+  color: { type: [String, Boolean, null], required: false, skipCheck: true }
 });
 const { filterProps } = useProps(props);
 const { toggleSort, sortBy, isSorted } = useSort();
 const { someSelected, allSelected, selectAll } = useSelection();
 const { getSortIcon } = useHeadersCell(props);
 const { getPadding } = useCell();
-const { colorStyles } = useBothColor(toRef(props, "bgColor"), toRef(props, "color"));
+const { colorClasses, colorStyles } = useBothColor(toRef(props, "bgColor"), toRef(props, "color"));
 const headerProps = mergeProps(props.headerProps ?? {});
 const sortedItems = (column) => {
   return sortBy.value.findIndex((x) => {
@@ -129,11 +132,20 @@ const dataTableHeaderCellClasses = computed(() => {
       "origam-data-table-header-cell--sorted": isSorted(props.column),
       "origam-data-table-header-cell--fixed": props.column.fixed
     },
+    colorClasses.value,
     props.class
   ];
 });
 const dataTableHeaderCellStyles = computed(() => {
   return [
+    // `colorStyles` from `useBothColor` was only applied to the
+    // sort badge pre-fix — meaning consumers passing `color` /
+    // `bgColor` on the DataTable saw NO effect on the header
+    // row itself (the visual surface they actually want to
+    // theme). Apply at the cell level so `bg-color="primary"`
+    // paints the title row, and `color="primary"` tints the
+    // title text + sort indicator.
+    colorStyles.value,
     {
       width: convertToUnit(props.column.width),
       minWidth: convertToUnit(props.column.minWidth),
@@ -143,8 +155,14 @@ const dataTableHeaderCellStyles = computed(() => {
     props.style
   ];
 });
+const { id, css, load, isLoaded, unload } = useStyle(dataTableHeaderCellStyles);
 defineExpose({
-  filterProps
+  filterProps,
+  css,
+  id,
+  load,
+  unload,
+  isLoaded
 });
 </script>
 
@@ -153,53 +171,51 @@ defineExpose({
 		$this: &;
 
 		align-items: center;
-		color: var(--origam-data-table-header-cell---color);
+		color: var(--origam-data-table-header-cell---color, var(--origam-color__text---primary));
 
 		&__sort-icon {
-			opacity: 0;
-			color: var(--origam-data-table-header-cell__sort-icon---color);
+			opacity: var(--origam-data-table-header-cell__sort-icon---opacity, 0);
+			color: var(--origam-data-table-header-cell__sort-icon---color, var(--origam-color__text---primary));
 
 			&--active {
-				color: var(--origam-data-table-header-cell__sort-icon--active---color);
+				color: var(--origam-data-table-header-cell__sort-icon--active---color, var(--origam-color__text---primary));
 			}
 		}
 
 		&__content {
 			display: flex;
 			align-items: center;
+			gap: var(--origam-data-table-header-cell__content---gap, 4px);
 		}
 
 		&__sort-badge {
 			display: inline-flex;
 			justify-content: center;
 			align-items: center;
-			font-size: .875rem;
-			padding: 4px;
-			border-radius: 50%;
-			background: var(--origam-data-table-header-cell__sort-badge---background);
-			min-width: 20px;
-			min-height: 20px;
-			width: 20px;
-			height: 20px
-		}
-
-		span {
-			padding-left: 5px;
+			font-size: var(--origam-data-table-header-cell__sort-badge---font-size, 0.875rem);
+			padding: var(--origam-data-table-header-cell__sort-badge---padding, var(--origam-space---1, 4px));
+			border-radius: var(--origam-data-table-header-cell__sort-badge---border-radius, var(--origam-radius---full, 9999px));
+			background: var(--origam-data-table-header-cell__sort-badge---background, var(--origam-color__border---default));
+			color: var(--origam-data-table-header-cell__sort-badge---color, var(--origam-color__text---primary));
+			min-width: var(--origam-data-table-header-cell__sort-badge---min-width, 20px);
+			min-height: var(--origam-data-table-header-cell__sort-badge---min-height, 20px);
+			width: var(--origam-data-table-header-cell__sort-badge---width, 20px);
+			height: var(--origam-data-table-header-cell__sort-badge---height, 20px)
 		}
 
 		&#{$this}--sortable {
-			cursor: pointer;
+			cursor: var(--origam-data-table-sortable---cursor, pointer);
 
 			&:hover {
 				#{$this}__sort-icon {
-					opacity: .5;
+					opacity: var(--origam-data-table-header-cell__sort-icon---opacity-hover, 0.5);
 				}
 			}
 		}
 
 		&#{$this}--sorted {
 			#{$this}__sort-icon {
-				opacity: 1;
+				opacity: var(--origam-data-table-header-cell__sort-icon---opacity-active, 1);
 			}
 		}
 
@@ -208,22 +224,8 @@ defineExpose({
 		}
 
 		&:deep(.origam-data-table-cell) {
-			background: var(--origam-data-table-header-cell---background);
-			color: var(--origam-data-table-header-cell---color);
+			background: var(--origam-data-table-header-cell---background, var(--origam-color__surface---raised));
+			color: var(--origam-data-table-header-cell---color, var(--origam-color__text---primary));
 		}
 	}
 </style>
-
-<style>
-	:root {
-		--origam-data-table-header-cell---background: rgba(33, 33, 33, 1);
-		--origam-data-table-header-cell---color: rgba(255, 255, 255, 1);
-
-		--origam-data-table-header-cell--sortable---color: rgba(255, 255, 255, 1);
-
-		--origam-data-table-header-cell__sort-badge---background: rgba(255, 255, 255, 0.12);
-
-		--origam-data-table-header-cell__sort-icon---color: rgba(255, 255, 255, 1);
-		--origam-data-table-header-cell__sort-icon--active---color: rgba(255, 255, 255, 1);
-	}
-</style>

package/dist/src/components/DataTable/OrigamDataTableHeaders.vue

@@ -1,58 +1,67 @@
 <template>
-	<template v-if="loading">
+	<template v-if="mobile">
+		<slot
+				name="mobile"
+				v-bind="slotProps"
+		>
+			<origam-data-table-headers-cell-mobile
+					ref="origamDataTableHeadersCellMobileRef"
+					:class="dataTableHeadersClasses"
+					:columns="columns"
+					:style="dataTableHeadersStyles"
+					v-bind="dataTableHeadersCellMobileProps"
+			/>
+		</slot>
+	</template>
+	<template v-else>
+		<slot
+				name="default"
+				v-bind="slotProps"
+		>
+			<origam-data-table-headers-cell
+					ref="origamDataTableHeadersCellRef"
+					:class="dataTableHeadersClasses"
+					:headers="headers"
+					:style="dataTableHeadersStyles"
+					v-bind="dataTableHeadersCellProps"
+			/>
+		</slot>
+	</template>
+
+	<template v-if="loaderConfig.isActive && loaderConfig.kind !== 'skeleton'">
 		<tr class="origam-data-table-headers origam-data-table-headers--progress">
 			<th
 					:colspan="columns.length"
-					class="origam-data-table-header-cell"
+					class="origam-data-table-headers__progress-cell"
 			>
 				<slot name="loader">
 					<origam-progress
 							:color="color"
-							:type="PROGRESS_TYPE.LINEAR"
-							absolute
-							active
-							indeterminate
-							thickness="4"
+							:type="loaderConfig.kind === 'line' ? PROGRESS_TYPE.LINEAR : PROGRESS_TYPE.CIRCULAR"
+							:active="true"
+							:indeterminate="loaderConfig.indeterminate"
+							:model-value="loaderConfig.modelValue"
+							thickness="2"
+							v-bind="loaderConfig.overrides"
 					/>
 				</slot>
 			</th>
 		</tr>
 	</template>
-	<template v-else>
-		<template v-if="mobile">
-			<slot
-					name="mobile"
-					v-bind="slotProps"
-			>
-				<origam-data-table-headers-cell-mobile
-						ref="origamDataTableHeadersCellMobileRef"
-						:class="dataTableHeadersClasses"
-						:columns="columns"
-						:style="dataTableHeadersStyles"
-						v-bind="dataTableHeadersCellMobileProps"
-				/>
-			</slot>
-		</template>
-		<template v-else>
-			<slot
-					name="default"
-					v-bind="slotProps"
-			>
-				<origam-data-table-headers-cell
-						ref="origamDataTableHeadersCellRef"
-						:class="dataTableHeadersClasses"
-						:headers="headers"
-						:style="dataTableHeadersStyles"
-						v-bind="dataTableHeadersCellProps"
-				/>
-			</slot>
-		</template>
-	</template>
 </template>
 
 <script setup>
 import { OrigamDataTableHeadersCell, OrigamDataTableHeadersCellMobile, OrigamProgress } from "../../components";
-import { useDisplay, useHeaders, useHeadersCell, useLoader, useProps, useSelection, useSort } from "../../composables";
+import {
+  useDisplay,
+  useHeaders,
+  useHeadersCell,
+  useLoader,
+  useProps,
+  useSelection,
+  useSort,
+  useStyle
+} from "../../composables";
 import { PROGRESS_TYPE } from "../../enums";
 import { computed, ref, StyleValue } from "vue";
 const props = defineProps({
@@ -60,13 +69,8 @@ const props = defineProps({
   class: { type: [String, Array, Object], required: false },
   style: { type: [String, Array, Object, Boolean, null], required: false, skipCheck: true },
   color: { type: [String, Boolean, null], required: false, skipCheck: true },
-  bgColor: { type: [String, Boolean, null], required: false, skipCheck: true },
-  activeColor: { type: [String, Boolean, null], required: false, skipCheck: true },
-  activeBgColor: { type: [String, Boolean, null], required: false, skipCheck: true },
-  hoverColor: { type: [String, Boolean, null], required: false, skipCheck: true },
-  hoverBgColor: { type: [String, Boolean, null], required: false, skipCheck: true },
   mobileBreakpoint: { type: null, required: false },
-  loading: { type: [Boolean, Number], required: false },
+  loading: { type: [Boolean, Number, Object], required: false },
   loadingText: { type: String, required: false },
   tag: { type: String, required: false },
   disableSort: { type: Boolean, required: false },
@@ -82,7 +86,7 @@ const origamDataTableHeadersCellMobileRef = ref();
 const { toggleSort, sortBy, isSorted } = useSort();
 const { someSelected, allSelected, selectAll } = useSelection();
 const { columns, headers } = useHeaders();
-const { loaderClasses } = useLoader(props);
+const { loaderClasses, loaderConfig } = useLoader(props, "line");
 const { getSortIcon } = useHeadersCell(props);
 const { displayClasses, mobile } = useDisplay(props);
 const slotProps = computed(() => {
@@ -120,29 +124,23 @@ const dataTableHeadersStyles = computed(() => {
     props.style
   ];
 });
+const { id, css, load, isLoaded, unload } = useStyle(dataTableHeadersStyles);
 defineExpose({
-  filterProps
+  filterProps,
+  css,
+  id,
+  load,
+  unload,
+  isLoaded
 });
 </script>
 
 <style lang="scss" scoped>
 	.origam-data-table-headers {
-		&__progress {
-			> .origam-data-table-headers-cell {
-				border: none;
-				height: auto;
-				padding: 0;
-			}
-
-			&:deep(.origam-progress) {
-				position: relative;
-			}
+		&--progress > &__progress-cell {
+			border: none;
+			height: auto;
+			padding: 0;
 		}
 	}
 </style>
-
-<style>
-	:root {
-
-	}
-</style>

package/dist/src/components/DataTable/OrigamDataTableHeadersCell.vue

@@ -24,7 +24,7 @@
 
 <script setup>
 import { OrigamDataTableHeaderCell } from "../../components";
-import { useProps } from "../../composables";
+import { useProps, useStyle } from "../../composables";
 import { computed, ref, StyleValue } from "vue";
 const props = defineProps({
   headers: { type: Array, required: true },
@@ -32,11 +32,6 @@ const props = defineProps({
   class: { type: [String, Array, Object], required: false },
   style: { type: [String, Array, Object, Boolean, null], required: false, skipCheck: true },
   color: { type: [String, Boolean, null], required: false, skipCheck: true },
-  bgColor: { type: [String, Boolean, null], required: false, skipCheck: true },
-  activeColor: { type: [String, Boolean, null], required: false, skipCheck: true },
-  activeBgColor: { type: [String, Boolean, null], required: false, skipCheck: true },
-  hoverColor: { type: [String, Boolean, null], required: false, skipCheck: true },
-  hoverBgColor: { type: [String, Boolean, null], required: false, skipCheck: true },
   disableSort: { type: Boolean, required: false },
   headerProps: { type: null, required: false },
   sticky: { type: Boolean, required: false },
@@ -47,9 +42,7 @@ const props = defineProps({
 const { filterProps } = useProps(props);
 const origamDataTableHeaderCellRef = ref();
 const dataTableHeaderCellProps = computed(() => {
-  return origamDataTableHeaderCellRef.value?.some((headerCell) => {
-    return headerCell?.filterProps(props);
-  });
+  return origamDataTableHeaderCellRef.value?.[0]?.filterProps(props);
 });
 const dataTableHeadersCellClasses = computed(() => {
   return [
@@ -61,7 +54,13 @@ const dataTableHeadersCellStyles = computed(() => {
     props.style
   ];
 });
+const { id, css, load, isLoaded, unload } = useStyle(dataTableHeadersCellStyles);
 defineExpose({
-  filterProps
+  filterProps,
+  css,
+  id,
+  load,
+  unload,
+  isLoaded
 });
 </script>

package/dist/src/components/DataTable/OrigamDataTableHeadersCellMobile.vue

@@ -186,7 +186,14 @@
 
 <script setup>
 import { OrigamChip, OrigamDataTableColumnCell, OrigamSelect } from "../../components";
-import { useHeadersCell, useLocale, useProps, useSelection, useSort } from "../../composables";
+import {
+  useHeadersCell,
+  useLocale,
+  useProps,
+  useSelection,
+  useSort,
+  useStyle
+} from "../../composables";
 import { DENSITY, MDI_ICONS } from "../../enums";
 import { computed, mergeProps, useSlots } from "vue";
 const props = defineProps({
@@ -201,12 +208,7 @@ const props = defineProps({
   multiSort: { type: Boolean, required: false },
   sortAscIcon: { type: null, required: false },
   sortDescIcon: { type: null, required: false },
-  color: { type: [String, Boolean, null], required: false, skipCheck: true },
-  bgColor: { type: [String, Boolean, null], required: false, skipCheck: true },
-  activeColor: { type: [String, Boolean, null], required: false, skipCheck: true },
-  activeBgColor: { type: [String, Boolean, null], required: false, skipCheck: true },
-  hoverColor: { type: [String, Boolean, null], required: false, skipCheck: true },
-  hoverBgColor: { type: [String, Boolean, null], required: false, skipCheck: true }
+  color: { type: [String, Boolean, null], required: false, skipCheck: true }
 });
 const emits = defineEmits(["click:clear", "click:prepend", "click:append"]);
 const { filterProps } = useProps(props);
@@ -255,7 +257,13 @@ const dataTableHeadersCellStyles = computed(() => {
     props.style
   ];
 });
+const { id, css, load, isLoaded, unload } = useStyle(dataTableHeadersCellStyles);
 defineExpose({
-  filterProps
+  filterProps,
+  css,
+  id,
+  load,
+  unload,
+  isLoaded
 });
 </script>

package/dist/src/components/DataTable/OrigamDataTableRow.vue

@@ -79,7 +79,16 @@
 
 <script setup>
 import { OrigamBtn, OrigamCheckboxBtn, OrigamDataTableColumnCell } from "../../components";
-import { useCell, useDisplay, useExpanded, useHeaders, useProps, useSelection, useSort } from "../../composables";
+import {
+  useCell,
+  useDisplay,
+  useExpanded,
+  useHeaders,
+  useProps,
+  useSelection,
+  useSort,
+  useStyle
+} from "../../composables";
 import { MDI_ICONS, SIZES } from "../../enums";
 import { getCurrentInstance, getObjectValueByPath } from "../../utils";
 import { computed, StyleValue, toDisplayString, withModifiers } from "vue";
@@ -179,8 +188,14 @@ const dataTableRowStyles = computed(() => {
     props.style
   ];
 });
+const { id, css, load, isLoaded, unload } = useStyle(dataTableRowStyles);
 defineExpose({
-  filterProps
+  filterProps,
+  css,
+  id,
+  load,
+  unload,
+  isLoaded
 });
 </script>
 
@@ -188,13 +203,18 @@ defineExpose({
 	.origam-data-table-row {
 		$this: &;
 
-		&__column-title {
-			font-weight: 500;
-			text-align: left;
+		background-color: var(--origam-data-table-row---background-color, var(--origam-color__surface---default));
+		color: var(--origam-data-table-row---color, var(--origam-color__text---primary));
+		transition-property: background-color;
+		transition-duration: var(--origam-data-table-row---transition-duration, 100ms);
+		transition-timing-function: var(--origam-data-table-row---transition-easing, cubic-bezier(0.4, 0, 0.2, 1));
+
+		&:hover {
+			background-color: var(--origam-data-table-row--hover---background-color, var(--origam-color__surface---overlay));
 		}
 
-		&__column-value {
-			text-align: right;
+		&__column-title {
+			font-weight: var(--origam-data-table-row__column-title---font-weight, 500);
 		}
 
 		&--clickable {
@@ -202,6 +222,14 @@ defineExpose({
 		}
 
 		&--mobile {
+			#{$this}__column-title {
+				text-align: left;
+			}
+
+			#{$this}__column-value {
+				text-align: right;
+			}
+
 			#{$this}__column {
 				height: fit-content;
 
@@ -221,7 +249,7 @@ defineExpose({
 				column-gap: 4px;
 				display: grid;
 				grid-template-columns: repeat(2, 1fr);
-				min-height: var(--origam-data-table-row--mobile__column);
+				min-height: var(--origam-data-table-row--mobile__column-min-height, var(--origam-data-table-row--mobile__column, 52px));
 
 				&:not(:last-child) {
 					border-bottom: 0;
@@ -230,9 +258,3 @@ defineExpose({
 		}
 	}
 </style>
-
-<style>
-	:root {
-		--origam-data-table-row--mobile__column: 52px;
-	}
-</style>