From 49c885e2138a5ef6bd5c44d40b20a0a2f8f4e59c Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 23 Oct 2021 11:17:41 +0900
Subject: [PATCH 1/3] =?UTF-8?q?fix(client):=20=E3=82=A6=E3=82=A3=E3=82=B8?=
 =?UTF-8?q?=E3=82=A7=E3=83=83=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=A7?=
 =?UTF-8?q?=E3=81=8D=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #7905
---
 CHANGELOG.md                          |  7 ++++++
 src/client/components/form/select.vue | 33 +++++++++++++++------------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c494fc53..d407ee3ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,13 @@
 
 -->
 
+## 12.x.x (unreleased)
+
+### Improvements
+
+### Bugfixes
+- クライアント: ウィジェットを追加できない問題を修正
+
 ## 12.93.1 (2021/10/23)
 
 ### Bugfixes
diff --git a/src/client/components/form/select.vue b/src/client/components/form/select.vue
index 30ccfd312..9efaf0269 100644
--- a/src/client/components/form/select.vue
+++ b/src/client/components/form/select.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs } from 'vue';
+import { defineComponent, onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs, VNode } from 'vue';
 import MkButton from '@client/components/ui/button.vue';
 import * as os from '@client/os';
 
@@ -140,6 +140,16 @@ export default defineComponent({
 			const menu = [];
 			let options = context.slots.default();
 
+			const pushOption = (option: VNode) => {
+				menu.push({
+					text: option.children,
+					active: v.value === option.props.value,
+					action: () => {
+						v.value = option.props.value;
+					},
+				});
+			};
+
 			for (const optionOrOptgroup of options) {
 				if (optionOrOptgroup.type === 'optgroup') {
 					const optgroup = optionOrOptgroup;
@@ -148,23 +158,16 @@ export default defineComponent({
 						text: optgroup.props.label,
 					});
 					for (const option of optgroup.children) {
-						menu.push({
-							text: option.children,
-							active: v.value === option.props.value,
-							action: () => {
-								v.value = option.props.value;
-							},
-						});
+						pushOption(option);
+					}
+				} else if (Array.isArray(optionOrOptgroup.children)) { // 何故かフラグメントになってくることがある
+					const fragment = optionOrOptgroup;
+					for (const option of fragment.children) {
+						pushOption(option);
 					}
 				} else {
 					const option = optionOrOptgroup;
-					menu.push({
-						text: option.children,
-						active: v.value === option.props.value,
-						action: () => {
-							v.value = option.props.value;
-						},
-					});
+					pushOption(option);
 				}
 			}
 

From 442b9fbbd83dd9b803c8ed4d14b4a9f34668812b Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 23 Oct 2021 11:34:41 +0900
Subject: [PATCH 2/3] :art:

---
 src/client/components/chart.vue | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/client/components/chart.vue b/src/client/components/chart.vue
index 8eb9f93f3..2b94bd679 100644
--- a/src/client/components/chart.vue
+++ b/src/client/components/chart.vue
@@ -1,5 +1,10 @@
 <template>
-<canvas ref="chartEl"></canvas>
+<div class="cbbedffa">
+	<canvas ref="chartEl"></canvas>
+	<div v-if="fetching" class="fetching">
+		<MkLoading/>
+	</div>
+</div>
 </template>
 
 <script lang="ts">
@@ -622,7 +627,28 @@ export default defineComponent({
 
 		return {
 			chartEl,
+			fetching,
 		};
 	},
 });
 </script>
+
+<style lang="scss" scoped>
+.cbbedffa {
+	position: relative;
+
+	> .fetching {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		-webkit-backdrop-filter: var(--blur, blur(12px));
+		backdrop-filter: var(--blur, blur(12px));
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		cursor: wait;
+	}
+}
+</style>

From cabb2800d4bb8b1e6d2fcc7c7416ab86fb3319b5 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 23 Oct 2021 11:36:39 +0900
Subject: [PATCH 3/3] 12.93.2

---
 CHANGELOG.md | 4 +---
 package.json | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d407ee3ca..7d2b3f715 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,7 @@
 
 -->
 
-## 12.x.x (unreleased)
-
-### Improvements
+## 12.93.2 (2021/10/23)
 
 ### Bugfixes
 - クライアント: ウィジェットを追加できない問題を修正
diff --git a/package.json b/package.json
index ea89c595b..9e1fdd482 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <syuilotan@yahoo.co.jp>",
-	"version": "12.93.1",
+	"version": "12.93.2",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",