Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: #232 : puik-link underline on multi-lines #233

Merged
merged 6 commits into from
Oct 30, 2023
Merged

fix: #232 : puik-link underline on multi-lines #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6aafc1b
fix: #232 : puik-link underline on multi-lines
mattgoud Oct 23, 2023
ad92018
fix: typo - the same tailwind class appeared twice (from-primary-500)
mattgoud Oct 24, 2023
707f0e8
fix: [link-animation] use background-position variation instead padding
mattgoud Oct 24, 2023
071dba6
fix: [link-animation] change background-position values
mattgoud Oct 24, 2023
60c2514
feat: [link animation] - tailwind classes for background-position
mattgoud Oct 24, 2023
ab28f69
fix: use text decoration underline
Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions packages/components/link/src/link.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,33 @@ import type { RouteLocationRaw } from 'vue-router'
import type { ExtractPropTypes, PropType } from 'vue'
import type Link from './link.vue'

export enum PuikLinkTarget {
BLANK = '_blank',
SELF = '_self',
PARENT = '_parent',
TOP = '_top',
}

export const targetVariants = ['_blank', '_self', '_parent', '_top'] as const
export type PuikTargetVariant = (typeof targetVariants)[number]
export type PuikTargetString = (typeof targetVariants)[number]

export enum PuikLinkSize {
SMALL = 'sm',
MEDIUM = 'md',
LARGE = 'lg',
}

export const linkSizes = ['sm', 'md', 'lg'] as const
export type PuikLinkSize = (typeof linkSizes)[number]
export type PuikLinkSizeString = (typeof linkSizes)[number]

export const linkProps = buildProps({
size: {
type: String as PropType<PuikLinkSize>,
type: [
String as PropType<PuikLinkSize>,
String as PropType<PuikLinkSizeString>,
],
required: false,
default: 'md',
default: PuikLinkSize.MEDIUM,
},
href: {
type: String,
Expand All @@ -25,9 +42,12 @@ export const linkProps = buildProps({
default: undefined,
},
target: {
type: String as PropType<PuikTargetVariant>,
type: [
String as PropType<PuikLinkTarget>,
String as PropType<PuikTargetString>,
],
required: false,
default: '_self',
default: PuikLinkTarget.SELF,
},
title: {
type: String,
Expand Down
11 changes: 10 additions & 1 deletion packages/components/link/src/link.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,26 @@
:class="['puik-link', `puik-link--${size}`]"
>
<slot></slot>

<span
v-if="props.target === PuikLinkTarget.BLANK"
class="puik-link__target__icon"
>
{{ TARGET_BLANK_ICON }}
</span>
</component>
</template>

<script setup lang="ts">
import { computed } from 'vue'
import { linkProps } from './link'
import { linkProps, PuikLinkTarget } from './link'

defineOptions({
name: 'PuikLink',
})

const props = defineProps(linkProps)
const TARGET_BLANK_ICON = 'open_in_new'

const componentType = computed(() => {
if (props.to) {
Expand Down
41 changes: 24 additions & 17 deletions packages/theme/src/link.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,47 @@
@use './common/typography.scss';

.puik-link {
@apply relative text-primary transition m-0.5 p-0.5 py-[4px];
&:before {
content: '';
@apply absolute h-[1px] bg-primary-500 bottom-[4px] left-[50%] translate-x-[-50%] transition-all ease-in-out duration-150;
width: calc(100% - 4px);
}
@apply cursor-pointer
relative
text-primary

underline
decoration-auto
underline-offset-[2px]
decoration-primary-500

transition-all
duration-150;

&:hover,
&:active {
@apply cursor-pointer;
&:before {
@apply bg-primary-800 bottom-[2.5px] transition-all ease-in-out duration-150;
}
&:before:visited {
@apply bg-primary-800;
}
@apply decoration-primary underline-offset-[5px];
}

&:focus-visible {
@apply outline-none ring-2 ring-blue rounded-[4px] shadow-none;
}

&:visited {
@apply text-purple-700;
}
&[target='_blank'] {
&:after {
content: 'open_in_new';
@apply font-materialIcons ml-1.5 inline-block align-middle leading-[1em];

&__target__icon {
@apply font-materialIcons align-bottom;

&:before {
@apply content-['_'] text-[0.35rem] leading-[0.25rem];
}
}

&--sm {
@extend .puik-body-small;
}

&--md {
@extend .puik-body-default;
}

&--lg {
@extend .puik-body-large;
}
Expand Down
Loading