From 7d8a2161152e6bcfd2eb1a5f5949b5452d1c5949 Mon Sep 17 00:00:00 2001 From: MrKBear Date: Sun, 20 Mar 2022 15:04:58 +0800 Subject: [PATCH] Move layout into context --- source/Component/Container/Container.tsx | 2 +- source/{Model => Context}/Layout.ts | 2 +- source/Context/Setting.tsx | 2 +- source/Page/SimulatorWeb/SimulatorWeb.tsx | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename source/{Model => Context}/Layout.ts (98%) diff --git a/source/Component/Container/Container.tsx b/source/Component/Container/Container.tsx index b60e1d5..a520149 100644 --- a/source/Component/Container/Container.tsx +++ b/source/Component/Container/Container.tsx @@ -2,7 +2,7 @@ import { Localization } from "@Component/Localization/Localization"; import { Theme, BackgroundLevel, FontLevel } from "@Component/Theme/Theme"; import { Themes } from "@Context/Setting"; import { DirectionalHint } from "@fluentui/react"; -import { ILayout, LayoutDirection } from "@Model/Layout"; +import { ILayout, LayoutDirection } from "@Context/Layout"; import { Component, ReactNode, MouseEvent } from "react"; import { getPanelById, getPanelInfoById } from "../../Panel/Panel"; import { LocalizationTooltipHost } from "../Localization/LocalizationTooltipHost"; diff --git a/source/Model/Layout.ts b/source/Context/Layout.ts similarity index 98% rename from source/Model/Layout.ts rename to source/Context/Layout.ts index 9e5229a..2cfc84e 100644 --- a/source/Model/Layout.ts +++ b/source/Context/Layout.ts @@ -1,4 +1,4 @@ -import { Emitter } from "./Emitter"; +import { Emitter } from "@Model/Emitter"; enum LayoutDirection { X = 1, diff --git a/source/Context/Setting.tsx b/source/Context/Setting.tsx index 3665667..898df5d 100644 --- a/source/Context/Setting.tsx +++ b/source/Context/Setting.tsx @@ -1,7 +1,7 @@ import { createContext } from "react"; import { superConnect, superConnectWithEvent } from "./Context"; import { Emitter } from "@Model/Emitter"; -import { Layout } from "@Model/Layout"; +import { Layout } from "./Layout"; /** * 主题模式 diff --git a/source/Page/SimulatorWeb/SimulatorWeb.tsx b/source/Page/SimulatorWeb/SimulatorWeb.tsx index 77c76f7..d4612bf 100644 --- a/source/Page/SimulatorWeb/SimulatorWeb.tsx +++ b/source/Page/SimulatorWeb/SimulatorWeb.tsx @@ -7,9 +7,9 @@ import { StatusProvider, Status } from "@Context/Status"; import { ClassicRenderer } from "@GLRender/ClassicRenderer"; import { initializeIcons } from '@fluentui/font-icons-mdl2'; import { RootContainer } from "@Component/Container/RootContainer"; -import { LayoutDirection } from "@Model/Layout"; -import "./SimulatorWeb.scss"; +import { LayoutDirection } from "@Context/Layout"; import { CommandBar } from "@Component/CommandBar/CommandBar"; +import "./SimulatorWeb.scss"; initializeIcons("https://img.mrkbear.com/fabric-cdn-prod_20210407.001/");