Merge branch 'develop'

CHANGELOG.md

@@ -7,6 +7,11 @@
 
 -->
 
+## 12.93.2 (2021/10/23)
+
+### Bugfixes
+- クライアント: ウィジェットを追加できない問題を修正
+
 ## 12.93.1 (2021/10/23)
 
 ### Bugfixes

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",

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>

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);
 				}
 			}