🐛 エラー修正

takuma-ru · May 9, 2024 · 08d6986 · 08d6986
1 parent a4e5f90
commit 08d6986
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 31 deletions.
diff --git a/packages/core/eslint.config.mjs b/packages/core/eslint.config.mjs
@@ -20,6 +20,7 @@ export default antfu({
 			{ arraysInArrays: false },
 		],
 		"style/array-bracket-newline": [ "error", { multiline: true, minItems: 3 } ],
+		"no-unused-vars": "error",
 	},
 	typescript: true,
 	vue: true,

diff --git a/packages/core/src/components/SwipeModal/SwipeModal.vue b/packages/core/src/components/SwipeModal/SwipeModal.vue
@@ -5,6 +5,7 @@ import { usePointerEvent } from "../../hooks/usePointerEvent";
 import { useModalAnim } from "../../hooks/useModalAnim";
 import { useCssVar } from "../../hooks/useCssVar";
 import { ANIMATION_EASING } from "../../constants";
+import { setPageScrollable } from "../../utils/setPageScrollable";
 import type { SwipeModalEmits, SwipeModalProps } from "./SwipeModal.types";
 
 const props = withDefaults(defineProps<SwipeModalProps>(), {
@@ -83,34 +84,6 @@ const {
 
 // functions
 
-/**
- * 背景がスクロールできるかどうかを制御する
- */
-const setPageScrollable = (scrollable: "auto" | "hidden" | "reset") => {
-	if (scrollable === "reset") {
-		document.documentElement.style.removeProperty("overflow");
-		document.documentElement.style.removeProperty("overscroll-behavior-y");
-		return;
-	}
-
-	let dv = window;
-	let xOffset, yOffset, de;
-	if (document.defaultView) {
-		dv = document.defaultView;
-		xOffset = dv.scrollX;
-		yOffset = dv.scrollY;
-	}
-	else {
-		de = document.documentElement;
-		xOffset = de.scrollLeft;
-		yOffset = de.scrollTop;
-	}
-	document.documentElement.style.overflow = scrollable;
-	document.documentElement.style.overscrollBehaviorY
-    = scrollable === "auto" ? "auto" : "none";
-	dv.scrollTo(xOffset, yOffset);
-};
-
 const handleClickDialog = (event: MouseEvent) => {
 	if (!props.isBackdrop)
 		return;

diff --git a/packages/core/src/hooks/useCssVar.ts b/packages/core/src/hooks/useCssVar.ts
@@ -17,7 +17,7 @@ export const useCssVar = ({ scopeName }: UseCssVarParameter) => {
 	};
 
 	const setCssVar = ({ name, value, fallback }: SetCssVarParameter) => {
-	  document.documentElement.style.setProperty(`--${scopeName}-${name}`, value);
+		document.documentElement.style.setProperty(`--${scopeName}-${name}`, value);
 
 		fallback?.(
 			name,

diff --git a/packages/core/src/hooks/useModalAnim.ts b/packages/core/src/hooks/useModalAnim.ts
@@ -1,4 +1,4 @@
-import type { ComputedRef, Ref } from "vue";
+import type { Ref } from "vue";
 import type { SwipeModalProps } from "../components/SwipeModal/SwipeModal.types";
 import { ANIMATION_EASING } from "../constants";
 import { useCssVar } from "./useCssVar";

diff --git a/packages/core/src/hooks/usePointerEvent.ts b/packages/core/src/hooks/usePointerEvent.ts
@@ -1,4 +1,4 @@
-import type { ComputedRef, Ref, WritableComputedRef } from "vue";
+import type { Ref, WritableComputedRef } from "vue";
 import { ref } from "vue";
 import type { SwipeModalProps } from "../components/SwipeModal/SwipeModal.types";
 import { useModalAnim } from "./useModalAnim";

diff --git a/packages/core/src/utils/setPageScrollable.ts b/packages/core/src/utils/setPageScrollable.ts
@@ -0,0 +1,27 @@
+/**
+ * 背景がスクロールできるかどうかを制御する
+ */
+export const setPageScrollable = (scrollable: "auto" | "hidden" | "reset") => {
+	if (scrollable === "reset") {
+		document.documentElement.style.removeProperty("overflow");
+		document.documentElement.style.removeProperty("overscroll-behavior-y");
+		return;
+	}
+
+	let dv = window;
+	let xOffset, yOffset, de;
+	if (document.defaultView) {
+		dv = document.defaultView;
+		xOffset = dv.scrollX;
+		yOffset = dv.scrollY;
+	}
+	else {
+		de = document.documentElement;
+		xOffset = de.scrollLeft;
+		yOffset = de.scrollTop;
+	}
+	document.documentElement.style.overflow = scrollable;
+	document.documentElement.style.overscrollBehaviorY
+    = scrollable === "auto" ? "auto" : "none";
+	dv.scrollTo(xOffset, yOffset);
+};