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.

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: tip is not displayed completely on boundaries #321

Merged
merged 2 commits into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"@vueuse/core": "^10.9.0",
"dexie": "^4.0.1",
"file-saver": "^2.0.5",
"floating-vue": "^5.2.2",
"fzf": "^0.5.2",
"hotkeys-js": "^3.13.7",
"iconify-icon": "^2.0.0",
Expand Down
41 changes: 41 additions & 0 deletions pnpm-lock.yaml

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

6 changes: 2 additions & 4 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<script setup lang='ts'>
import { themeColor } from './store'
import { useThemeColor } from './hooks'

const style = computed<any>(() => ({
'--theme-color': themeColor.value,
}))
const { style } = useThemeColor()
</script>

<template>
Expand Down
65 changes: 34 additions & 31 deletions src/components/Icons.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<script setup lang="ts">
import type { PropType } from 'vue'
import { getSearchHighlightHTML } from '../hooks'
import { Tooltip } from 'floating-vue'
import { getSearchHighlightHTML, useThemeColor } from '../hooks'

defineProps({
icons: {
Expand Down Expand Up @@ -36,44 +37,41 @@ defineProps({
default: 'text-dark-600 dark:text-dark-900',
},
})

defineEmits<{
(event: 'select', id: string): void
}>()

const { style } = useThemeColor()
</script>

<template>
<div
class="non-dragging flex flex-wrap select-none justify-center"
:class="`text-${size} ${colorClass}`"
>
<div class="non-dragging flex flex-wrap select-none justify-center" :class="`text-${size} ${colorClass}`">
<div
v-for="icon of icons"
:key="icon"
class="non-dragging icons-item flex tooltip"
v-for="icon of icons " :key="icon" class="non-dragging icons-item relative"
:class="[spacing, selected.includes(namespace + icon) ? 'active' : '']"
@click="$emit('select', namespace + icon)"
>
<Icon
:key="icon"
class="tooltip-content non-dragging leading-none h-1em"
:cache="true"
:icon="namespace + icon"
/>
<span
v-if="display === 'list'"
class="tooltip-content text-sm ml-1 px-1 m-auto"
v-html="getSearchHighlightHTML(icon, search)"
/>
<span
v-else
border="~ dark-only"
class="tooltip-text bg-base shadow leading-none whitespace-nowrap z-100"
>
<span class="opacity-75">
{{ icon }}
</span>
</span>
<div v-if="display === 'list'" class="icon-border flex gap-1">
<Icon
:key="icon" class="non-dragging leading-none" :cache="true"
:icon="namespace + icon"
/>
<span
class="text-sm px-1 m-auto"
v-html="getSearchHighlightHTML(icon, search)"
/>
</div>
<Tooltip v-else placement="bottom">
<Icon
:key="icon" class="non-dragging leading-none icon-border h-1em" :cache="true"
:icon="namespace + icon"
/>
<template #popper>
<div :style="style" class="leading-none border-none z-100 text-primary opacity-75 text-sm">
{{ icon }}
</div>
</template>
</Tooltip>
</div>
</div>
</template>
Expand All @@ -82,9 +80,13 @@ defineEmits<{
.icons-item:hover,
.icons-item.active {
color: var(--theme-color);
}

.icon-border {
position: relative;
}
.icons-item.active::after {

.icon-border.active::after {
content: '';
position: absolute;
top: -3px;
Expand All @@ -95,7 +97,8 @@ defineEmits<{
background: var(--theme-color);
opacity: 0.1;
}
.icons-item:hover::before {

.icon-border:hover::before {
content: '';
position: absolute;
top: -4px;
Expand Down
11 changes: 11 additions & 0 deletions src/hooks/color.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { themeColor } from '../store'

export function useThemeColor() {
const style = computed<any>(() => ({
'--theme-color': themeColor.value,
}))

return {
style,
}
}
1 change: 1 addition & 0 deletions src/hooks/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export * from './search'
export * from './color'
8 changes: 7 additions & 1 deletion src/hooks/search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,13 @@ export function useSearch(collection: Ref<CollectionMeta | null>) {
}
}

export function getSearchHighlightHTML(text: string, search: string, baseClass = 'text-gray-500', activeClass = 'text-primary') {
// @unocss-include
export function getSearchHighlightHTML(
text: string,
search: string,
baseClass = 'color-fade',
activeClass = 'text-primary',
) {
const start = text.indexOf(search || '')

if (!search || start < 0)
Expand Down
31 changes: 8 additions & 23 deletions src/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -71,31 +71,16 @@ html.dark {
}

/* Tootip */
.tooltip {
position: relative;
.v-popper--theme-tooltip .v-popper__inner {
--uno: important-bg-base;
}

.tooltip .tooltip-text {
visibility: hidden;
font-size: 14px;
text-align: center;
border-radius: 4px;
position: absolute;
z-index: 1;
padding: 5px 8px;
top: 135%;
left: 50%;
transform: translateX(-50%);
opacity: 0;
transition: opacity 0.3s;
@apply whitespace-nowrap;
}

@media (hover: hover) {
.tooltip:hover .tooltip-text {
visibility: visible;
opacity: 1;
}
.v-popper--theme-tooltip .v-popper__arrow-outer {
--uno: important-border-none;
}

.v-popper--theme-tooltip .v-popper__inner {
--uno: border border-base;
}

/* fallback black svg in dark mode */
Expand Down
1 change: 1 addition & 0 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { createRouter, createWebHashHistory, createWebHistory } from 'vue-router
import { disableCache } from 'iconify-icon'
import App from './App.vue'
import '@unocss/reset/tailwind.css'
import 'floating-vue/dist/style.css'
import './utils/electron'
import './main.css'
import 'uno.css'
Expand Down
Loading