Skip to content

Commit

Permalink
fix: stable FINN prod alpha-release (#50)
Browse files Browse the repository at this point in the history
* fix(package.json): remove fabric dependencies

* fix(package.json): bump @warp-ds/uno to 1.0.0-alpha.49

Get arbitrary values accepted for leading classes

* fix(package.json): bump component-classes to 1.0.0-alpha.115

Fix styling issues in Buttons, Tabs, Clickable and TextField
  • Loading branch information
BalbinaK committed Jul 7, 2023
1 parent 49daa56 commit 73b9d6d
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 56 deletions.
10 changes: 7 additions & 3 deletions components/generic/w-clickable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,19 @@ const type = computed(() => props.radio ? 'radio' : 'checkbox');
const labelClasses = computed(() => ({
[ccClickable.label]: props.label,
}));
const buttonOrLinkClasses = computed(() => ({
[ccClickable.buttonOrLink]: true,
[ccClickable.label]: props.label,
}))
</script>

<template>
<w-toggle-item v-if="radio || checkbox" :class="ccClickable.clickable" :type="type" :label-class="labelClasses" v-bind="$attrs">
<w-toggle-item v-if="radio || checkbox" :class="ccClickable.toggle" :type="type" :label-class="labelClasses" v-bind="$attrs">
<slot />
</w-toggle-item>
<component v-else :is="href ? 'a' : 'button'" :class="labelClasses" :href="href" :type="href ? undefined : ($attrs.type || 'button')">
<span :class="ccClickable.clickable" aria-hidden="true" />
<component v-else :is="href ? 'a' : 'button'" :class=buttonOrLinkClasses :href="href" :type="href ? undefined : ($attrs.type || 'button')">
<span :class=[ccClickable.buttonOrLinkStretch] aria-hidden="true" />
<slot />
</component>
</template>
Expand Down
2 changes: 1 addition & 1 deletion components/slider/w-slider.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
} from 'vue';
import { modelProps, createModel } from 'create-v-model';
import { slider as ccSlider } from '@warp-ds/component-classes';
import { useDimensions, createHandlers } from '@fabric-ds/core/slider';
import { useDimensions, createHandlers } from '@warp-ds/core/slider';
const attrs = useAttrs();
const props = defineProps({
Expand Down
8 changes: 3 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@
"keywords": [],
"license": "Apache-2.0",
"dependencies": {
"@fabric-ds/core": "^0.0.15",
"@fabric-ds/css": "^1.2.0",
"@warp-ds/core": "^1.0.0",
"@warp-ds/component-classes": "^1.0.0-alpha.115",
"@warp-ds/uno": "1.0.0-alpha.49",
"@floating-ui/dom": "^1.4.2",
"create-v-model": "^2.2.0",
"dom-focus-lock": "^1.1.0",
Expand All @@ -47,9 +48,6 @@
"@vitejs/plugin-vue": "^4.2.3",
"@vue/compiler-sfc": "^3.3.4",
"@vue/test-utils": "^2.4.0",
"@warp-ds/core": "^1.0.0",
"@warp-ds/component-classes": "^1.0.0-alpha.109",
"@warp-ds/uno": "1.0.0-alpha.47",
"cleave-lite": "^1.0.0",
"cz-conventional-changelog": "^3.3.0",
"drnm": "^0.9.0",
Expand Down
68 changes: 21 additions & 47 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 73b9d6d

Please sign in to comment.