jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support active sheet mechanism in Sandy

Browse Source 
Summary:
This diffs adds support for the activeSheets mechanism in Sandy. It should be removed in the future (see T78696648) since open a dialog and keeping dialog state locally results in much more straight forward code, but supporting this for now makes sure that old flows are still supported.

With this change the plugin selection during a Flipper export for example wouldn't become visible

Reviewed By: cekkaewnumchai

Differential Revision: D24620074

fbshipit-source-id: f0558f5738e86a84a5cd0b9d574a3cfd0a3bf424
This commit is contained in:
Michel Weststrate
2020-10-30 04:20:00 -07:00
committed by Facebook GitHub Bot
parent ef7d4ea487
commit 9deed974be
5 changed files with 105 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
desktop/app/src/App.tsx
View File

@@ -13,39 +13,19 @@ import {connect} from 'react-redux';
import TitleBar from './chrome/TitleBar';
import MainSidebar2 from './chrome/mainsidebar/MainSidebar2';
import DoctorBar from './chrome/DoctorBar';
import ShareSheetExportUrl from './chrome/ShareSheetExportUrl';
import SignInSheet from './chrome/SignInSheet';
import ExportDataPluginSheet from './chrome/ExportDataPluginSheet';
import ShareSheetExportFile from './chrome/ShareSheetExportFile';
import JSEmulatorLauncherSheet from './chrome/JSEmulatorLauncherSheet';
import PluginContainer from './PluginContainer';
import Sheet from './chrome/Sheet';
import {ipcRenderer, remote} from 'electron';
import {
ActiveSheet,
ShareType,
ACTIVE_SHEET_PLUGINS,
ACTIVE_SHEET_SHARE_DATA,
ACTIVE_SHEET_SIGN_IN,
ACTIVE_SHEET_SETTINGS,
ACTIVE_SHEET_DOCTOR,
ACTIVE_SHEET_SHARE_DATA_IN_FILE,
ACTIVE_SHEET_SELECT_PLUGINS_TO_EXPORT,
ACTIVE_SHEET_PLUGIN_SHEET,
ACTIVE_SHEET_JS_EMULATOR_LAUNCHER,
ACTIVE_SHEET_CHANGELOG,
setActiveSheet,
ACTIVE_SHEET_CHANGELOG_RECENT_ONLY,
setActiveSheet,
} from './reducers/application';
import {Logger} from './fb-interfaces/Logger';
import {State as Store} from './reducers/index';
import {StaticView} from './reducers/connections';
import PluginManager from './chrome/plugin-manager/PluginManager';
import StatusBar from './chrome/StatusBar';
import SettingsSheet from './chrome/SettingsSheet';
import DoctorSheet from './chrome/DoctorSheet';
import ChangelogSheet, {hasNewChangesToShow} from './chrome/ChangelogSheet';
import {hasNewChangesToShow} from './chrome/ChangelogSheet';
import QPL, {QuickLogActionType, FLIPPER_QPL_EVENTS} from './fb-stubs/QPL';
import {SheetRenderer} from './chrome/SheetRenderer';
const version = remote.app.getVersion();
@@ -55,8 +35,6 @@ type OwnProps = {
type StateFromProps = {
leftSidebarVisible: boolean;
activeSheet: ActiveSheet;
share: ShareType | null;
staticView: StaticView;
};
@@ -104,56 +82,6 @@ export class App extends React.Component<Props> {
}
}
getSheet = (onHide: () => any) => {
const {activeSheet} = this.props;
switch (activeSheet) {
case ACTIVE_SHEET_PLUGINS:
return <PluginManager onHide={onHide} />;
case ACTIVE_SHEET_SIGN_IN:
return <SignInSheet onHide={onHide} />;
case ACTIVE_SHEET_SETTINGS:
return <SettingsSheet platform={process.platform} onHide={onHide} />;
case ACTIVE_SHEET_DOCTOR:
return <DoctorSheet onHide={onHide} />;
case ACTIVE_SHEET_CHANGELOG:
return <ChangelogSheet onHide={onHide} />;
case ACTIVE_SHEET_CHANGELOG_RECENT_ONLY:
return <ChangelogSheet onHide={onHide} recent />;
case ACTIVE_SHEET_SELECT_PLUGINS_TO_EXPORT:
return <ExportDataPluginSheet onHide={onHide} />;
case ACTIVE_SHEET_SHARE_DATA:
return (
<ShareSheetExportUrl
onHide={onHide}
logger={this.props.logger}
closeOnFinish={
this.props.share != null && this.props.share.closeOnFinish
}
/>
);
case ACTIVE_SHEET_SHARE_DATA_IN_FILE:
return this.props.share && this.props.share.type === 'file' ? (
<ShareSheetExportFile
onHide={onHide}
file={this.props.share.file}
logger={this.props.logger}
/>
) : (
(() => {
console.error('No file provided when calling share sheet.');
return null;
})()
);
case ACTIVE_SHEET_PLUGIN_SHEET:
// Currently unused.
return null;
case ACTIVE_SHEET_JS_EMULATOR_LAUNCHER:
return <JSEmulatorLauncherSheet onHide={onHide} />;
default:
return null;
}
};
render() {
return (
<Layout.Top>
@@ -163,7 +91,7 @@ export class App extends React.Component<Props> {
<DoctorBar />
</>
<>
<Sheet>{this.getSheet}</Sheet>
<SheetRenderer logger={this.props.logger} />
</>
</Layout.Top>
<Layout.Bottom>
@@ -198,13 +126,8 @@ export class App extends React.Component<Props> {
}
export default connect<StateFromProps, DispatchProps, OwnProps, Store>(
({
application: {leftSidebarVisible, activeSheet, share},
connections: {staticView},
}) => ({
({application: {leftSidebarVisible}, connections: {staticView}}) => ({
leftSidebarVisible,
activeSheet,
share: share,
staticView,
}),
{

2
desktop/app/src/chrome/Sheet.tsx
View File

@@ -76,6 +76,8 @@ class Sheet extends Component<Props, State> {
}
componentWillUnmount() {
// When switching to Sandy, we need to short-circuit this as this component itself will be thrown away
this.props.onHideSheet();
document.removeEventListener('keydown', this.onKeyDown);
}

93
desktop/app/src/chrome/SheetRenderer.tsx Normal file
View File

@@ -0,0 +1,93 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @format
*/
import React, {useCallback} from 'react';
import ShareSheetExportUrl from './ShareSheetExportUrl';
import SignInSheet from './SignInSheet';
import ExportDataPluginSheet from './ExportDataPluginSheet';
import ShareSheetExportFile from './ShareSheetExportFile';
import JSEmulatorLauncherSheet from './JSEmulatorLauncherSheet';
import Sheet from './Sheet';
import {
ACTIVE_SHEET_PLUGINS,
ACTIVE_SHEET_SHARE_DATA,
ACTIVE_SHEET_SIGN_IN,
ACTIVE_SHEET_SETTINGS,
ACTIVE_SHEET_DOCTOR,
ACTIVE_SHEET_SHARE_DATA_IN_FILE,
ACTIVE_SHEET_SELECT_PLUGINS_TO_EXPORT,
ACTIVE_SHEET_PLUGIN_SHEET,
ACTIVE_SHEET_JS_EMULATOR_LAUNCHER,
ACTIVE_SHEET_CHANGELOG,
ACTIVE_SHEET_CHANGELOG_RECENT_ONLY,
} from '../reducers/application';
import {Logger} from '../fb-interfaces/Logger';
import PluginManager from './plugin-manager/PluginManager';
import SettingsSheet from './SettingsSheet';
import DoctorSheet from './DoctorSheet';
import ChangelogSheet from './ChangelogSheet';
import {useStore} from '../utils/useStore';
export function SheetRenderer({logger}: {logger: Logger}) {
const activeSheet = useStore((state) => state.application.activeSheet);
// MWE: share being grabbed (and stored) here isn't ideal, clean up in the future?
const share = useStore((state) => state.application.share);
const renderSheet = useCallback(
(onHide: () => any) => {
switch (activeSheet) {
case ACTIVE_SHEET_PLUGINS:
return <PluginManager onHide={onHide} />;
case ACTIVE_SHEET_SIGN_IN:
return <SignInSheet onHide={onHide} />;
case ACTIVE_SHEET_SETTINGS:
return <SettingsSheet platform={process.platform} onHide={onHide} />;
case ACTIVE_SHEET_DOCTOR:
return <DoctorSheet onHide={onHide} />;
case ACTIVE_SHEET_CHANGELOG:
return <ChangelogSheet onHide={onHide} />;
case ACTIVE_SHEET_CHANGELOG_RECENT_ONLY:
return <ChangelogSheet onHide={onHide} recent />;
case ACTIVE_SHEET_SELECT_PLUGINS_TO_EXPORT:
return <ExportDataPluginSheet onHide={onHide} />;
case ACTIVE_SHEET_SHARE_DATA:
return (
<ShareSheetExportUrl
onHide={onHide}
logger={logger}
closeOnFinish={share != null && share.closeOnFinish}
/>
);
case ACTIVE_SHEET_SHARE_DATA_IN_FILE:
return share && share.type === 'file' ? (
<ShareSheetExportFile
onHide={onHide}
file={share.file}
logger={logger}
/>
) : (
(() => {
console.error('No file provided when calling share sheet.');
return null;
})()
);
case ACTIVE_SHEET_PLUGIN_SHEET:
// Currently unused.
return null;
case ACTIVE_SHEET_JS_EMULATOR_LAUNCHER:
return <JSEmulatorLauncherSheet onHide={onHide} />;
default:
return null;
}
},
[activeSheet, logger, share],
);
return <Sheet>{renderSheet}</Sheet>;
}

2
desktop/app/src/plugin.tsx
View File

@@ -8,7 +8,6 @@
*/
import {KeyboardActions} from './MenuBar';
import {App} from './App';
import {Logger} from './fb-interfaces/Logger';
import Client from './Client';
import {Store} from './reducers/index';
@@ -162,7 +161,6 @@ export abstract class FlipperBasePlugin<
reducers: {
[actionName: string]: (state: State, actionData: any) => Partial<State>;
} = {};
app: App | null = null;
onKeyboardAction: ((action: string) => void) | undefined;
toJSON() {

4
desktop/app/src/sandy-chrome/SandyApp.tsx
View File

@@ -25,6 +25,7 @@ import {AppInspect} from './appinspect/AppInspect';
import PluginContainer from '../PluginContainer';
import {ContentContainer} from './ContentContainer';
import {Notification} from './notification/Notification';
import {SheetRenderer} from '../chrome/SheetRenderer';
export type ToplevelNavItem =
| 'appinspect'
@@ -92,7 +93,10 @@ export function SandyApp({logger}: {logger: Logger}) {
return (
<SandyContext.Provider value={true}>
<Layout.Top>
<>
<TemporarilyTitlebar />
<SheetRenderer logger={logger} />
</>
<Layout.Left>
<Layout.Horizontal>
<LeftRail