From a6f3f0c42dbcb7bda3ed16643cbf9a332f03ccbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E5=BD=A6?= Date: Fri, 7 Jan 2022 14:57:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BD=8E=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=BB=84=E4=BB=B6=E5=9C=A8=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E4=B8=AD=E4=BD=BF=E7=94=A8=E6=97=B6=E5=88=87=E6=8D=A2=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E8=A7=86=E5=9B=BE=E4=B8=8D=E7=94=9F=E6=95=88?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/react-simulator-renderer/src/renderer-view.tsx | 7 ++++--- packages/react-simulator-renderer/src/renderer.ts | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/react-simulator-renderer/src/renderer-view.tsx b/packages/react-simulator-renderer/src/renderer-view.tsx index a2c523596..9e7685aad 100644 --- a/packages/react-simulator-renderer/src/renderer-view.tsx +++ b/packages/react-simulator-renderer/src/renderer-view.tsx @@ -80,7 +80,8 @@ export class Routes extends Component<{ rendererContainer: SimulatorRendererCont function ucfirst(s: string) { return s.charAt(0).toUpperCase() + s.substring(1); } -function getDeviceView(view: any, device: string, mode: string) { + +export function getDeviceView(view: any, device: string, mode: string) { if (!view || typeof view === 'string') { return view; } @@ -126,8 +127,8 @@ class Layout extends Component<{ rendererContainer: SimulatorRendererContainer } @observer class Renderer extends Component<{ - rendererContainer: SimulatorRendererContainer, - documentInstance: DocumentInstance, + rendererContainer: SimulatorRendererContainer; + documentInstance: DocumentInstance; }> { startTime: number | null = null; diff --git a/packages/react-simulator-renderer/src/renderer.ts b/packages/react-simulator-renderer/src/renderer.ts index 7290759f1..db64f5b75 100644 --- a/packages/react-simulator-renderer/src/renderer.ts +++ b/packages/react-simulator-renderer/src/renderer.ts @@ -1,7 +1,7 @@ import React, { createElement, ReactInstance } from 'react'; import { render as reactRender } from 'react-dom'; import { host } from './host'; -import SimulatorRendererView from './renderer-view'; +import SimulatorRendererView, { getDeviceView } from './renderer-view'; import { computed, observable as obx, untracked, makeObservable, configure } from 'mobx'; import { getClientRects } from './utils/get-client-rects'; import { reactFindDOMNodes, FIBER_KEY } from './utils/react-find-dom-nodes'; @@ -466,7 +466,8 @@ export class SimulatorRendererContainer implements BuiltinSimulatorRenderer { isEmpty: () => false, }; viewProps._leaf = _leaf; - return createElement(Comp, viewProps, children); + const View = getDeviceView(Comp, renderer.device, renderer.designMode); + return createElement(View, viewProps, children); }, }); } From 578c4af53283f6c2d545765ece13ad495243d18a Mon Sep 17 00:00:00 2001 From: "alex.mm" Date: Mon, 10 Jan 2022 20:28:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=A4=A7=E7=BA=B2=E6=A0=91=E6=96=87?= =?UTF-8?q?=E5=AD=97=E8=BF=87=E9=95=BF,=E5=8F=B3=E4=BE=A7=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E7=9C=8B=E4=B8=8D=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/plugin-outline-pane/src/views/style.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/plugin-outline-pane/src/views/style.less b/packages/plugin-outline-pane/src/views/style.less index 32fd979cf..1ecab512a 100644 --- a/packages/plugin-outline-pane/src/views/style.less +++ b/packages/plugin-outline-pane/src/views/style.less @@ -232,7 +232,7 @@ display: flex; align-items: center; align-self: stretch; - overflow: visible; + overflow: hidden; margin-right: 5px; .tree-node-title-input {