revert emoji picker changes
This commit is contained in:
		
							parent
							
								
									efafc31c9b
								
							
						
					
					
						commit
						38d5303ccd
					
				|  | @ -1,17 +1,16 @@ | |||
| <template> | ||||
| <!-- このコンポーネントの要素のclassは親から利用されるのでむやみに弄らないこと --> | ||||
| <section> | ||||
| 	<header class="_acrylic" @click="shown = !shown"> | ||||
| 		<i class="toggle fa-fw" :class="shown ? 'fas fa-chevron-down' : 'fas fa-chevron-up'"></i> <slot></slot> ({{ emojis.length }}) | ||||
| 	</header> | ||||
| 	<div v-if="shown" class="body"> | ||||
| 	<div v-if="shown"> | ||||
| 		<button | ||||
| 			v-for="emoji in emojis" | ||||
| 			:key="emoji" | ||||
| 			class="_button item" | ||||
| 			class="_button" | ||||
| 			@click="emit('chosen', emoji, $event)" | ||||
| 		> | ||||
| 			<MkEmoji class="emoji" :emoji="emoji" :normal="true"/> | ||||
| 			<MkEmoji :emoji="emoji" :normal="true"/> | ||||
| 		</button> | ||||
| 	</div> | ||||
| </section> | ||||
|  |  | |||
|  | @ -3,67 +3,67 @@ | |||
| 	<input ref="search" v-model.trim="q" class="search" data-prevent-emoji-insert :class="{ filled: q != null && q != '' }" :placeholder="i18n.ts.search" type="search" @paste.stop="paste" @keyup.enter="done()"> | ||||
| 	<div ref="emojis" class="emojis"> | ||||
| 		<section class="result"> | ||||
| 			<div v-if="searchResultCustom.length > 0" class="body"> | ||||
| 			<div v-if="searchResultCustom.length > 0"> | ||||
| 				<button | ||||
| 					v-for="emoji in searchResultCustom" | ||||
| 					:key="emoji.id" | ||||
| 					class="_button item" | ||||
| 					class="_button" | ||||
| 					:title="emoji.name" | ||||
| 					tabindex="0" | ||||
| 					@click="chosen(emoji, $event)" | ||||
| 				> | ||||
| 					<!--<MkEmoji v-if="emoji.char != null" :emoji="emoji.char"/>--> | ||||
| 					<img class="emoji" :src="disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url"/> | ||||
| 					<img :src="disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url"/> | ||||
| 				</button> | ||||
| 			</div> | ||||
| 			<div v-if="searchResultUnicode.length > 0" class="body"> | ||||
| 			<div v-if="searchResultUnicode.length > 0"> | ||||
| 				<button | ||||
| 					v-for="emoji in searchResultUnicode" | ||||
| 					:key="emoji.name" | ||||
| 					class="_button item" | ||||
| 					class="_button" | ||||
| 					:title="emoji.name" | ||||
| 					tabindex="0" | ||||
| 					@click="chosen(emoji, $event)" | ||||
| 				> | ||||
| 					<MkEmoji class="emoji" :emoji="emoji.char"/> | ||||
| 					<MkEmoji :emoji="emoji.char"/> | ||||
| 				</button> | ||||
| 			</div> | ||||
| 		</section> | ||||
| 
 | ||||
| 		<div v-if="tab === 'index'" class="group index"> | ||||
| 		<div v-if="tab === 'index'" class="index"> | ||||
| 			<section v-if="showPinned"> | ||||
| 				<div class="body"> | ||||
| 				<div> | ||||
| 					<button | ||||
| 						v-for="emoji in pinned" | ||||
| 						:key="emoji" | ||||
| 						class="_button item" | ||||
| 						class="_button" | ||||
| 						tabindex="0" | ||||
| 						@click="chosen(emoji, $event)" | ||||
| 					> | ||||
| 						<MkEmoji class="emoji" :emoji="emoji" :normal="true"/> | ||||
| 						<MkEmoji :emoji="emoji" :normal="true"/> | ||||
| 					</button> | ||||
| 				</div> | ||||
| 			</section> | ||||
| 
 | ||||
| 			<section> | ||||
| 				<header class="_acrylic"><i class="far fa-clock fa-fw"></i> {{ i18n.ts.recentUsed }}</header> | ||||
| 				<div class="body"> | ||||
| 				<div> | ||||
| 					<button | ||||
| 						v-for="emoji in recentlyUsedEmojis" | ||||
| 						:key="emoji" | ||||
| 						class="_button item" | ||||
| 						class="_button" | ||||
| 						@click="chosen(emoji, $event)" | ||||
| 					> | ||||
| 						<MkEmoji class="emoji" :emoji="emoji" :normal="true"/> | ||||
| 						<MkEmoji :emoji="emoji" :normal="true"/> | ||||
| 					</button> | ||||
| 				</div> | ||||
| 			</section> | ||||
| 		</div> | ||||
| 		<div class="group"> | ||||
| 		<div> | ||||
| 			<header class="_acrylic">{{ i18n.ts.customEmojis }}</header> | ||||
| 			<XSection v-for="category in customEmojiCategories" :key="'custom:' + category" :initial-shown="false" :emojis="customEmojis.filter(e => e.category === category).map(e => ':' + e.name + ':')" @chosen="chosen">{{ category || i18n.ts.other }}</XSection> | ||||
| 		</div> | ||||
| 		<div class="group"> | ||||
| 		<div> | ||||
| 			<header class="_acrylic">{{ i18n.ts.emoji }}</header> | ||||
| 			<XSection v-for="category in categories" :key="category" :emojis="emojilist.filter(e => e.category === category).map(e => e.char)" @chosen="chosen">{{ category }}</XSection> | ||||
| 		</div> | ||||
|  | @ -419,16 +419,19 @@ defineExpose({ | |||
| 					font-size: 15px; | ||||
| 				} | ||||
| 
 | ||||
| 				> .body { | ||||
| 				> div { | ||||
| 					display: grid; | ||||
| 					grid-template-columns: var(--columns); | ||||
| 					font-size: 30px; | ||||
| 
 | ||||
| 					> .item { | ||||
| 					> button { | ||||
| 						aspect-ratio: 1 / 1; | ||||
| 						width: auto; | ||||
| 						height: auto; | ||||
| 						min-width: 0; | ||||
| 
 | ||||
| 						> * { | ||||
| 							font-size: 30px; | ||||
| 						} | ||||
| 					} | ||||
| 				} | ||||
| 			} | ||||
|  | @ -479,7 +482,7 @@ defineExpose({ | |||
| 			display: none; | ||||
| 		} | ||||
| 
 | ||||
| 		> .group { | ||||
| 		> div { | ||||
| 			&:not(.index) { | ||||
| 				padding: 4px 0 8px 0; | ||||
| 				border-top: solid 0.5px var(--divider); | ||||
|  | @ -514,18 +517,16 @@ defineExpose({ | |||
| 				} | ||||
| 			} | ||||
| 
 | ||||
| 			> .body { | ||||
| 			> div { | ||||
| 				position: relative; | ||||
| 				padding: $pad; | ||||
| 
 | ||||
| 				> .item { | ||||
| 				> button { | ||||
| 					position: relative; | ||||
| 					padding: 0; | ||||
| 					width: var(--eachSize); | ||||
| 					height: var(--eachSize); | ||||
| 					contain: strict; | ||||
| 					border-radius: 4px; | ||||
| 					font-size: 24px; | ||||
| 
 | ||||
| 					&:focus-visible { | ||||
| 						outline: solid 2px var(--focus); | ||||
|  | @ -541,7 +542,8 @@ defineExpose({ | |||
| 						box-shadow: inset 0 0.15em 0.3em rgba(27, 31, 35, 0.15); | ||||
| 					} | ||||
| 
 | ||||
| 					> .emoji { | ||||
| 					> * { | ||||
| 						font-size: 24px; | ||||
| 						height: 1.25em; | ||||
| 						vertical-align: -.25em; | ||||
| 						pointer-events: none; | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue