mirror of
				https://codeberg.org/yeentown/barkey.git
				synced 2025-11-04 07:24:13 +00:00 
			
		
		
		
	chore: Use clipboard API directly (#14227)
* chore: Use clipboard API directly * fix: Fix lint
This commit is contained in:
		
							parent
							
								
									8b4933cc48
								
							
						
					
					
						commit
						68bcd91d57
					
				
					 22 changed files with 23 additions and 50 deletions
				
			
		| 
						 | 
				
			
			@ -30,7 +30,7 @@ import * as os from '@/os.js';
 | 
			
		|||
import MkLoading from '@/components/global/MkLoading.vue';
 | 
			
		||||
import { defaultStore } from '@/store.js';
 | 
			
		||||
import { i18n } from '@/i18n.js';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
 | 
			
		||||
const props = defineProps<{
 | 
			
		||||
	code: string;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -39,7 +39,7 @@ import { misskeyApi } from '@/scripts/misskey-api.js';
 | 
			
		|||
import { i18n } from '@/i18n.js';
 | 
			
		||||
import { defaultStore } from '@/store.js';
 | 
			
		||||
import { claimAchievement } from '@/scripts/achievements.js';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { MenuItem } from '@/types/menu.js';
 | 
			
		||||
 | 
			
		||||
const props = withDefaults(defineProps<{
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -62,7 +62,7 @@ import { computed } from 'vue';
 | 
			
		|||
import * as Misskey from 'misskey-js';
 | 
			
		||||
import MkFolder from '@/components/MkFolder.vue';
 | 
			
		||||
import MkButton from '@/components/MkButton.vue';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { i18n } from '@/i18n.js';
 | 
			
		||||
import * as os from '@/os.js';
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 | 
			
		|||
 | 
			
		||||
<script lang="ts" setup>
 | 
			
		||||
import { } from 'vue';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import * as os from '@/os.js';
 | 
			
		||||
import { i18n } from '@/i18n.js';
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -33,7 +33,7 @@ import { computed, onMounted, onUnmounted, provide, ref, shallowRef } from 'vue'
 | 
			
		|||
import RouterView from '@/components/global/RouterView.vue';
 | 
			
		||||
import MkWindow from '@/components/MkWindow.vue';
 | 
			
		||||
import { popout as _popout } from '@/scripts/popout.js';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { url } from '@/config.js';
 | 
			
		||||
import { useScrollPositionManager } from '@/nirax.js';
 | 
			
		||||
import { i18n } from '@/i18n.js';
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -16,7 +16,7 @@ export type MkABehavior = 'window' | 'browser' | null;
 | 
			
		|||
<script lang="ts" setup>
 | 
			
		||||
import { computed, inject, shallowRef } from 'vue';
 | 
			
		||||
import * as os from '@/os.js';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { url } from '@/config.js';
 | 
			
		||||
import { i18n } from '@/i18n.js';
 | 
			
		||||
import { useRouter } from '@/router/supplier.js';
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -31,7 +31,7 @@ import { defaultStore } from '@/store.js';
 | 
			
		|||
import { customEmojisMap } from '@/custom-emojis.js';
 | 
			
		||||
import * as os from '@/os.js';
 | 
			
		||||
import { misskeyApiGet } from '@/scripts/misskey-api.js';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import * as sound from '@/scripts/sound.js';
 | 
			
		||||
import { i18n } from '@/i18n.js';
 | 
			
		||||
import MkCustomEmojiDetailedDialog from '@/components/MkCustomEmojiDetailedDialog.vue';
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,7 +14,7 @@ import { char2fluentEmojiFilePath, char2twemojiFilePath } from '@/scripts/emoji-
 | 
			
		|||
import { defaultStore } from '@/store.js';
 | 
			
		||||
import { colorizeEmoji, getEmojiName } from '@/scripts/emojilist.js';
 | 
			
		||||
import * as os from '@/os.js';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import * as sound from '@/scripts/sound.js';
 | 
			
		||||
import { i18n } from '@/i18n.js';
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -22,7 +22,7 @@ import MkEmojiPickerDialog from '@/components/MkEmojiPickerDialog.vue';
 | 
			
		|||
import MkPopupMenu from '@/components/MkPopupMenu.vue';
 | 
			
		||||
import MkContextMenu from '@/components/MkContextMenu.vue';
 | 
			
		||||
import { MenuItem } from '@/types/menu.js';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { pleaseLogin } from '@/scripts/please-login.js';
 | 
			
		||||
import { showMovedDialog } from '@/scripts/show-moved-dialog.js';
 | 
			
		||||
import { getHTMLElementOrNull } from '@/scripts/get-dom-node-or-null.js';
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -93,7 +93,7 @@ import MkFoldableSection from '@/components/MkFoldableSection.vue';
 | 
			
		|||
import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 | 
			
		||||
import { PageHeaderItem } from '@/types/page-header.js';
 | 
			
		||||
import { isSupportShare } from '@/scripts/navigator.js';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { miLocalStorage } from '@/local-storage.js';
 | 
			
		||||
import { useRouter } from '@/router/supplier.js';
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -43,7 +43,7 @@ import { url } from '@/config.js';
 | 
			
		|||
import MkButton from '@/components/MkButton.vue';
 | 
			
		||||
import { clipsCache } from '@/cache.js';
 | 
			
		||||
import { isSupportShare } from '@/scripts/navigator.js';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
 | 
			
		||||
const props = defineProps<{
 | 
			
		||||
	clipId: string,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -210,7 +210,7 @@ import { apiUrl } from '@/config.js';
 | 
			
		|||
import { $i } from '@/account.js';
 | 
			
		||||
import * as sound from '@/scripts/sound.js';
 | 
			
		||||
import MkRange from '@/components/MkRange.vue';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
 | 
			
		||||
type FrontendMonoDefinition = {
 | 
			
		||||
	id: string;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 | 
			
		|||
import * as Misskey from 'misskey-js';
 | 
			
		||||
import * as os from '@/os.js';
 | 
			
		||||
import { misskeyApiGet } from '@/scripts/misskey-api.js';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { i18n } from '@/i18n.js';
 | 
			
		||||
import MkCustomEmojiDetailedDialog from '@/components/MkCustomEmojiDetailedDialog.vue';
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -78,7 +78,7 @@ import MkCode from '@/components/MkCode.vue';
 | 
			
		|||
import { defaultStore } from '@/store.js';
 | 
			
		||||
import { $i } from '@/account.js';
 | 
			
		||||
import { isSupportShare } from '@/scripts/navigator.js';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { pleaseLogin } from '@/scripts/please-login.js';
 | 
			
		||||
 | 
			
		||||
const props = defineProps<{
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -77,7 +77,7 @@ import { definePageMetadata } from '@/scripts/page-metadata.js';
 | 
			
		|||
import { defaultStore } from '@/store.js';
 | 
			
		||||
import { $i } from '@/account.js';
 | 
			
		||||
import { isSupportShare } from '@/scripts/navigator.js';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { useRouter } from '@/router/supplier.js';
 | 
			
		||||
 | 
			
		||||
const router = useRouter();
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -125,7 +125,7 @@ import { $i } from '@/account.js';
 | 
			
		|||
import { isSupportShare } from '@/scripts/navigator.js';
 | 
			
		||||
import { instance } from '@/instance.js';
 | 
			
		||||
import { getStaticImageUrl } from '@/scripts/media-proxy.js';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
 | 
			
		||||
const props = defineProps<{
 | 
			
		||||
	pageName: string;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -82,7 +82,7 @@ import MkCode from '@/components/MkCode.vue';
 | 
			
		|||
import MkFolder from '@/components/MkFolder.vue';
 | 
			
		||||
import MkKeyValue from '@/components/MkKeyValue.vue';
 | 
			
		||||
import * as os from '@/os.js';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { ColdDeviceStorage } from '@/store.js';
 | 
			
		||||
import { unisonReload } from '@/scripts/unison-reload.js';
 | 
			
		||||
import { i18n } from '@/i18n.js';
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -38,7 +38,7 @@ import MkSelect from '@/components/MkSelect.vue';
 | 
			
		|||
import MkInput from '@/components/MkInput.vue';
 | 
			
		||||
import MkButton from '@/components/MkButton.vue';
 | 
			
		||||
import { Theme, getBuiltinThemesRef } from '@/scripts/theme.js';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import * as os from '@/os.js';
 | 
			
		||||
import { getThemes, removeTheme } from '@/theme-store.js';
 | 
			
		||||
import { i18n } from '@/i18n.js';
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -6,33 +6,6 @@
 | 
			
		|||
/**
 | 
			
		||||
 * Clipboardに値をコピー(TODO: 文字列以外も対応)
 | 
			
		||||
 */
 | 
			
		||||
export default val => {
 | 
			
		||||
	// 空div 生成
 | 
			
		||||
	const tmp = document.createElement('div');
 | 
			
		||||
	// 選択用のタグ生成
 | 
			
		||||
	const pre = document.createElement('pre');
 | 
			
		||||
 | 
			
		||||
	// 親要素のCSSで user-select: none だとコピーできないので書き換える
 | 
			
		||||
	pre.style.webkitUserSelect = 'auto';
 | 
			
		||||
	pre.style.userSelect = 'auto';
 | 
			
		||||
 | 
			
		||||
	tmp.appendChild(pre).textContent = val;
 | 
			
		||||
 | 
			
		||||
	// 要素を画面外へ
 | 
			
		||||
	const s = tmp.style;
 | 
			
		||||
	s.position = 'fixed';
 | 
			
		||||
	s.right = '200%';
 | 
			
		||||
 | 
			
		||||
	// body に追加
 | 
			
		||||
	document.body.appendChild(tmp);
 | 
			
		||||
	// 要素を選択
 | 
			
		||||
	document.getSelection().selectAllChildren(tmp);
 | 
			
		||||
 | 
			
		||||
	// クリップボードにコピー
 | 
			
		||||
	const result = document.execCommand('copy');
 | 
			
		||||
 | 
			
		||||
	// 要素削除
 | 
			
		||||
	document.body.removeChild(tmp);
 | 
			
		||||
 | 
			
		||||
	return result;
 | 
			
		||||
export function copyToClipboard(input: string | null) {
 | 
			
		||||
	if (input) navigator.clipboard.writeText(input);
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -6,7 +6,7 @@
 | 
			
		|||
import * as Misskey from 'misskey-js';
 | 
			
		||||
import { defineAsyncComponent } from 'vue';
 | 
			
		||||
import { i18n } from '@/i18n.js';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import * as os from '@/os.js';
 | 
			
		||||
import { misskeyApi } from '@/scripts/misskey-api.js';
 | 
			
		||||
import { MenuItem } from '@/types/menu.js';
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -11,7 +11,7 @@ import { i18n } from '@/i18n.js';
 | 
			
		|||
import { instance } from '@/instance.js';
 | 
			
		||||
import * as os from '@/os.js';
 | 
			
		||||
import { misskeyApi } from '@/scripts/misskey-api.js';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { url } from '@/config.js';
 | 
			
		||||
import { defaultStore, noteActions } from '@/store.js';
 | 
			
		||||
import { miLocalStorage } from '@/local-storage.js';
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -7,7 +7,7 @@ import { toUnicode } from 'punycode';
 | 
			
		|||
import { defineAsyncComponent, ref, watch } from 'vue';
 | 
			
		||||
import * as Misskey from 'misskey-js';
 | 
			
		||||
import { i18n } from '@/i18n.js';
 | 
			
		||||
import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 | 
			
		||||
import { host, url } from '@/config.js';
 | 
			
		||||
import * as os from '@/os.js';
 | 
			
		||||
import { misskeyApi } from '@/scripts/misskey-api.js';
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue