summaryrefslogtreecommitdiff
path: root/packages/frontend/src/components/grid
diff options
context:
space:
mode:
authorかっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>2025-01-26 20:10:22 +0900
committerGitHub <noreply@github.com>2025-01-26 11:10:22 +0000
commit297186e492b20c3e54f8cbfe51ec2d7694ca7068 (patch)
tree89607c3f0d68b75834b008b449873e06982792e0 /packages/frontend/src/components/grid
parentfix(frontend): 画面を閉じる直前にAudioContextを閉じるように (... (diff)
downloadmisskey-297186e492b20c3e54f8cbfe51ec2d7694ca7068.tar.gz
misskey-297186e492b20c3e54f8cbfe51ec2d7694ca7068.tar.bz2
misskey-297186e492b20c3e54f8cbfe51ec2d7694ca7068.zip
enhance(frontend): 絵文字管理画面β(ローカル)のUI・UX改善 (#15349)
* enhance(frontend): 絵文字管理画面β(ローカル)のUI・UX改善 * fix * :art: * 表示件数をメニューから変更するように * 確認ダイアログ * fix i18n * needWideArea: trueならwidgetの開閉ボタンを表示しないように * fix: 検索ウィンドウは一つしか開けないように
Diffstat (limited to 'packages/frontend/src/components/grid')
-rw-r--r--packages/frontend/src/components/grid/MkDataCell.vue35
-rw-r--r--packages/frontend/src/components/grid/MkGrid.vue56
-rw-r--r--packages/frontend/src/components/grid/MkHeaderCell.vue6
-rw-r--r--packages/frontend/src/components/grid/grid.ts5
4 files changed, 83 insertions, 19 deletions
diff --git a/packages/frontend/src/components/grid/MkDataCell.vue b/packages/frontend/src/components/grid/MkDataCell.vue
index 0ffd42abda..e473b7c1af 100644
--- a/packages/frontend/src/components/grid/MkDataCell.vue
+++ b/packages/frontend/src/components/grid/MkDataCell.vue
@@ -39,13 +39,15 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ cell.value }}
</div>
<div v-else-if="cellType === 'boolean'">
- <span v-if="cell.value === true" class="ti ti-check"/>
- <span v-else class="ti"/>
+ <div :class="[$style.bool, {
+ [$style.boolTrue]: cell.value === true,
+ 'ti ti-check': cell.value === true,
+ }]"></div>
</div>
<div v-else-if="cellType === 'image'">
<img
- :src="cell.value as string"
- :alt="cell.value as string"
+ :src="cell.value"
+ :alt="cell.value"
:class="$style.viewImage"
@load="emitContentSizeChanged"
/>
@@ -375,6 +377,31 @@ $cellHeight: 28px;
object-fit: cover;
}
+.bool {
+ position: relative;
+ width: 18px;
+ height: 18px;
+ background: var(--MI_THEME-panel);
+ border: solid 2px var(--MI_THEME-divider);
+ border-radius: 4px;
+ box-sizing: border-box;
+
+ &.boolTrue {
+ border-color: var(--MI_THEME-accent);
+ background: var(--MI_THEME-accent);
+
+ &::before {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ color: var(--MI_THEME-fgOnAccent);
+ font-size: 12px;
+ line-height: 18px;
+ }
+ }
+}
+
.editingInput {
padding: 0 8px;
width: 100%;
diff --git a/packages/frontend/src/components/grid/MkGrid.vue b/packages/frontend/src/components/grid/MkGrid.vue
index 60738365fb..4dbd4ebcae 100644
--- a/packages/frontend/src/components/grid/MkGrid.vue
+++ b/packages/frontend/src/components/grid/MkGrid.vue
@@ -7,7 +7,11 @@ SPDX-License-Identifier: AGPL-3.0-only
<div
ref="rootEl"
class="mk_grid_border"
- :class="[$style.grid]"
+ :class="[$style.grid, {
+ [$style.noOverflowHandling]: rootSetting.noOverflowStyle,
+ 'mk_grid_root_rounded': rootSetting.rounded,
+ 'mk_grid_root_border': rootSetting.outerBorder,
+ }]"
@mousedown.prevent="onMouseDown"
@keydown="onKeyDown"
@contextmenu.prevent.stop="onContextMenu"
@@ -77,10 +81,17 @@ const emit = defineEmits<{
}>();
const props = defineProps<{
- settings: GridSetting,
- data: DataSource[]
+ settings: GridSetting;
+ data: DataSource[];
}>();
+const rootSetting: Required<GridSetting['root']> = {
+ noOverflowStyle: false,
+ rounded: true,
+ outerBorder: true,
+ ...props.settings.root,
+};
+
// non-reactive
// eslint-disable-next-line vue/no-setup-props-reactivity-loss
const rowSetting: Required<GridRowSetting> = {
@@ -1277,32 +1288,48 @@ onMounted(() => {
overflow-x: scroll;
// firefoxだとスクロールバーがセルに重なって見づらくなってしまうのでスペースを空けておく
padding-bottom: 8px;
+
+ &.noOverflowHandling {
+ overflow-x: revert;
+ padding-bottom: 0;
+ }
}
</style>
<style lang="scss">
$borderSetting: solid 0.5px var(--MI_THEME-divider);
-$borderRadius: var(--MI-radius);
// 配下コンポーネントを含めて一括してコントロールするため、scopedもmoduleも使用できない
.mk_grid_border {
+ --rootBorderSetting: none;
+ --borderRadius: 0;
+
border-spacing: 0;
+ &.mk_grid_root_border {
+ --rootBorderSetting: #{$borderSetting};
+ }
+
+ &.mk_grid_root_rounded {
+ --borderRadius: var(--MI-radius);
+ }
+
.mk_grid_thead {
.mk_grid_tr {
.mk_grid_th {
border-left: $borderSetting;
- border-top: $borderSetting;
+ border-top: var(--rootBorderSetting);
&:first-child {
// 左上セル
- border-top-left-radius: $borderRadius;
+ border-left: var(--rootBorderSetting);
+ border-top-left-radius: var(--borderRadius);
}
&:last-child {
// 右上セル
- border-top-right-radius: $borderRadius;
- border-right: $borderSetting;
+ border-top-right-radius: var(--borderRadius);
+ border-right: var(--rootBorderSetting);
}
}
}
@@ -1314,9 +1341,14 @@ $borderRadius: var(--MI-radius);
border-left: $borderSetting;
border-top: $borderSetting;
+ &:first-child {
+ // 左端の列
+ border-left: var(--rootBorderSetting);
+ }
+
&:last-child {
// 一番右端の列
- border-right: $borderSetting;
+ border-right: var(--rootBorderSetting);
}
}
}
@@ -1324,16 +1356,16 @@ $borderRadius: var(--MI-radius);
.last_row {
.mk_grid_td, .mk_grid_th {
// 一番下の行
- border-bottom: $borderSetting;
+ border-bottom: var(--rootBorderSetting);
&:first-child {
// 左下セル
- border-bottom-left-radius: $borderRadius;
+ border-bottom-left-radius: var(--borderRadius);
}
&:last-child {
// 右下セル
- border-bottom-right-radius: $borderRadius;
+ border-bottom-right-radius: var(--borderRadius);
}
}
}
diff --git a/packages/frontend/src/components/grid/MkHeaderCell.vue b/packages/frontend/src/components/grid/MkHeaderCell.vue
index 605d27c6d6..aecfe7eaa3 100644
--- a/packages/frontend/src/components/grid/MkHeaderCell.vue
+++ b/packages/frontend/src/components/grid/MkHeaderCell.vue
@@ -14,10 +14,10 @@ SPDX-License-Identifier: AGPL-3.0-only
:data-grid-cell-col="column.index"
>
<div :class="$style.root">
- <div :class="$style.left"/>
+ <div :class="$style.left"></div>
<div :class="$style.wrapper">
<div ref="contentEl" :class="$style.contentArea">
- <span v-if="column.setting.icon" class="ti" :class="column.setting.icon" style="line-height: normal"/>
+ <span v-if="column.setting.icon" class="ti" :class="column.setting.icon" style="line-height: normal"></span>
<span v-else>{{ text }}</span>
</div>
</div>
@@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
:class="$style.right"
@mousedown="onHandleMouseDown"
@dblclick="onHandleDoubleClick"
- />
+ ></div>
</div>
</div>
</template>
diff --git a/packages/frontend/src/components/grid/grid.ts b/packages/frontend/src/components/grid/grid.ts
index 0cb3b6f28b..b82e12b304 100644
--- a/packages/frontend/src/components/grid/grid.ts
+++ b/packages/frontend/src/components/grid/grid.ts
@@ -9,6 +9,11 @@ import { GridColumnSetting } from '@/components/grid/column.js';
import { GridRowSetting } from '@/components/grid/row.js';
export type GridSetting = {
+ root?: {
+ noOverflowStyle?: boolean;
+ rounded?: boolean;
+ outerBorder?: boolean;
+ };
row?: GridRowSetting;
cols: GridColumnSetting[];
cells?: GridCellSetting;