Merge branch 'master' into fix/change_UI_Setting_Qall

Author: damin3A3

build/gen-mplus.js

@@ -75,11 +75,14 @@ const getUrlFromSrc = src => {
 }
 
 const generateFilename = font => {
-  const i = getUrlFromSrc(font.src).match(/\/v\d+\/[^.]+\.(\d+)\.woff2/)
-  if (!i) throw new Error(`Unexpected: ${getUrlFromSrc(font.src)}`)
   const family = font['font-family'].replace(/[' ]/g, '')
   const weight = font['font-weight'].replace(/[' ]/g, '')
-  return `${family}.${weight}.${i[1]}.woff2`
+
+  const fontSrcWithId = getUrlFromSrc(font.src).match(/\/v\d+\/([^/]+)\.woff2/)
+  if (!fontSrcWithId) {
+    throw new Error(`Unexpected URL: ${getUrlFromSrc(font.src)}`)
+  }
+  return `${family}.${weight}.${fontSrcWithId[1]}.woff2`
 }
 
 const downloadAndtransform = async (url, filename) => {

src/components/GroupManager/DesktopGroupManager.vue

@@ -41,7 +41,7 @@ const { openGroupCreateModal } = useGroupCreateModalOpener()
   scrollbar-gutter: stable;
 }
 .close {
-  position: absolute;
+  position: fixed;
   top: 30px;
   right: 60px;
 }

src/components/Modal/FileModal/FileModal.vue

@@ -39,5 +39,9 @@ const { clearModal } = useModalStore()
 <style module lang="scss">
 .fileContainer {
   height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
 }
 </style>

src/components/ShareTarget/ShareTargetMessageInput.vue

@@ -7,8 +7,9 @@
           <textarea
             :id="id"
             ref="textareaRef"
-            v-model="state.text"
             :class="$style.input"
+            :value="state.text"
+            @input="event => state.text = (event.target as HTMLTextAreaElement).value"
           />
         </div>
         <div :class="$style.controls">

src/components/UI/ClickOutside.ts

@@ -6,7 +6,8 @@ import {
   cloneVNode,
   shallowRef,
   onMounted,
-  onBeforeUnmount
+  onBeforeUnmount,
+  ref
 } from 'vue'
 import { isIOS } from '/@/lib/dom/browser'
 import { useModalStore } from '/@/store/ui/modal'
@@ -23,7 +24,8 @@ const filterChildren = <T extends VNode>(vnodes: T[]) =>
     return true
   })
 
-const eventName = isIOS() ? 'touchend' : 'click'
+const startEventName = isIOS() ? 'touchstart' : 'mousedown'
+const endEventName = isIOS() ? 'touchend' : 'mouseup'
 
 /**
  * そのデフォルトスロットに指定した要素の外でクリックされたときにclickOutsideイベントを発火する
@@ -51,8 +53,9 @@ export default defineComponent({
     const element = shallowRef<Element | ComponentPublicInstance>()
 
     const { shouldShowModal } = useModalStore()
+    const isMouseDown = ref(false)
 
-    const onClick = (e: MouseEvent | TouchEvent) => {
+    const onMouseDown = (e: MouseEvent | TouchEvent) => {
       if (!element.value) return
 
       if (props.unableWhileModalOpen && shouldShowModal.value) return
@@ -64,17 +67,36 @@ export default defineComponent({
         return
       }
 
+      isMouseDown.value = true
+      if (props.stop) {
+        e.stopPropagation()
+      }
+    }
+    const onMouseUp = (e: MouseEvent | TouchEvent) => {
+      if (!isMouseDown.value) return
+      isMouseDown.value = false
+
+      if (!element.value) return
+      const ele =
+        element.value instanceof Element ? element.value : element.value.$el
+
+      if (ele === e.target || e.composedPath().includes(ele)) {
+        return
+      }
+
       emit('clickOutside', e)
       if (props.stop) {
         e.stopPropagation()
       }
     }
 
     onMounted(() => {
-      window.addEventListener(eventName, onClick, { capture: true })
+      window.addEventListener(startEventName, onMouseDown, { capture: true })
+      window.addEventListener(endEventName, onMouseUp, { capture: true })
     })
     onBeforeUnmount(() => {
-      window.removeEventListener(eventName, onClick, { capture: true })
+      window.removeEventListener(startEventName, onMouseDown, { capture: true })
+      window.removeEventListener(endEventName, onMouseUp, { capture: true })
     })
 
     return () => {