From 901c8709a23d3918d403034d8d25686611b1758b Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Sat, 24 Jun 2023 12:16:57 +0000 Subject: [PATCH] move drawer component to layout --- .../{DraggableDrawer => Layout/draggableDrawer}/index.jsx | 3 ++- .../components/Layout/{drawer => draggableDrawer}/index.less | 4 ++-- packages/app/src/components/Layout/drawer/index.jsx | 4 +--- packages/app/src/components/index.js | 1 - 4 files changed, 5 insertions(+), 7 deletions(-) rename packages/app/src/components/{DraggableDrawer => Layout/draggableDrawer}/index.jsx (99%) rename packages/app/src/components/Layout/{drawer => draggableDrawer}/index.less (96%) diff --git a/packages/app/src/components/DraggableDrawer/index.jsx b/packages/app/src/components/Layout/draggableDrawer/index.jsx similarity index 99% rename from packages/app/src/components/DraggableDrawer/index.jsx rename to packages/app/src/components/Layout/draggableDrawer/index.jsx index bd75e509..723cecce 100755 --- a/packages/app/src/components/DraggableDrawer/index.jsx +++ b/packages/app/src/components/Layout/draggableDrawer/index.jsx @@ -7,6 +7,8 @@ import Observer from "react-intersection-observer" import { css } from "@emotion/css" import { createPortal } from "react-dom" +import "./index.less" + export default class DraggableDrawer extends Component { static propTypes = { open: PropTypes.bool.isRequired, @@ -141,7 +143,6 @@ export default class DraggableDrawer extends Component { return false } - // check if event.target has dragger argument const inDraggerArea = !!event.target.closest("#dragger-area") const start = pageY diff --git a/packages/app/src/components/Layout/drawer/index.less b/packages/app/src/components/Layout/draggableDrawer/index.less similarity index 96% rename from packages/app/src/components/Layout/drawer/index.less rename to packages/app/src/components/Layout/draggableDrawer/index.less index 997cae23..b9f2fe07 100755 --- a/packages/app/src/components/Layout/drawer/index.less +++ b/packages/app/src/components/Layout/draggableDrawer/index.less @@ -39,11 +39,11 @@ .dragger-area { width: 100%; - height: 10px; + height: 50px; position: absolute; display: flex; - align-items: center; + align-items: flex-start; justify-content: center; top: 10px; diff --git a/packages/app/src/components/Layout/drawer/index.jsx b/packages/app/src/components/Layout/drawer/index.jsx index df92346b..f80bfd81 100755 --- a/packages/app/src/components/Layout/drawer/index.jsx +++ b/packages/app/src/components/Layout/drawer/index.jsx @@ -1,10 +1,8 @@ import React from "react" import { Drawer as AntdDrawer } from "antd" -import { DraggableDrawer } from "components" +import DraggableDrawer from "../draggableDrawer" import { EventBus } from "evite" -import "./index.less" - export default class DrawerController extends React.Component { constructor(props) { super(props) diff --git a/packages/app/src/components/index.js b/packages/app/src/components/index.js index 959040ee..ae0dd642 100755 --- a/packages/app/src/components/index.js +++ b/packages/app/src/components/index.js @@ -14,7 +14,6 @@ export { default as ActionsBar } from "./ActionsBar" export { default as ObjectInspector } from "./ObjectInspector" export { default as ModifierTag } from "./ModifierTag" export { default as StepsForm } from "./StepsForm" -export { default as DraggableDrawer } from "./DraggableDrawer" export { default as SearchButton } from "./SearchButton" export { default as Skeleton } from "./Skeleton" export { default as Navigation } from "./Navigation"