{renderCmdText(String(index + 1))}
;
- }
- let settings = (
- this.openScreenSettings(e, screen)} title="Actions" className="tab-gear">
-
- );
- let archived = screen.archived.get() ? (
-
- ) : null;
-
- let webShared = screen.isWebShared() ? (
-
- ) : null;
- return (
- this.handleSwitchScreen(screen.screenId)}
- onContextMenu={(event) => this.openScreenSettings(event, screen)}
- >
-
- );
- }
-
- render() {
- let { session } = this.props;
- if (session == null) {
- return null;
- }
- let screen: Screen = null;
- let index = 0;
- let showingScreens = [];
- let activeScreenId = session.activeScreenId.get();
- let screens = GlobalModel.getSessionScreens(session.sessionId);
- for (let screen of screens) {
- if (!screen.archived.get() || activeScreenId == screen.screenId) {
- showingScreens.push(screen);
- }
- }
- showingScreens.sort((a, b) => {
- let aidx = a.screenIdx.get();
- let bidx = b.screenIdx.get();
- if (aidx < bidx) {
- return -1;
- }
- if (aidx > bidx) {
- return 1;
- }
- return 0;
- });
- return (
-
- {archived}
- {webShared}
- {screen.name.get()}
-
- {tabIndex}
- {settings}
-
-
- );
- }
-}
-
-export { ScreenView, ScreenTabs };
+export { ScreenView };
diff --git a/src/main/sessionview/Screen/tabs.less b/src/app/workspace/screen/tabs.less
similarity index 100%
rename from src/main/sessionview/Screen/tabs.less
rename to src/app/workspace/screen/tabs.less
diff --git a/src/app/workspace/screen/tabs.tsx b/src/app/workspace/screen/tabs.tsx
new file mode 100644
index 00000000..a00d7d4b
--- /dev/null
+++ b/src/app/workspace/screen/tabs.tsx
@@ -0,0 +1,193 @@
+import * as React from "react";
+import * as mobxReact from "mobx-react";
+import * as mobx from "mobx";
+import { sprintf } from "sprintf-js";
+import { boundMethod } from "autobind-decorator";
+import { For } from "tsx-control-statements/components";
+import cn from "classnames";
+import { debounce } from "throttle-debounce";
+import dayjs from "dayjs";
+import localizedFormat from "dayjs/plugin/localizedFormat";
+import { GlobalModel, GlobalCommandRunner, Session, ScreenLines, Screen } from "../../../model/model";
+import { renderCmdText } from "../../common/common";
+import { ReactComponent as SparkleIcon } from "../../assets/icons/tab/sparkle.svg";
+import { ReactComponent as ActionsIcon } from "../../assets/icons/tab/actions.svg";
+import { ReactComponent as AddIcon } from "../../assets/icons/add.svg";
+
+import "../workspace.less";
+import "./tabs.less";
+
+dayjs.extend(localizedFormat);
+
+type OV
-
- {this.renderTab(screen, activeScreenId, index)}
-
-
- {/**
-
-
-
*/}
- move left {renderCmdText("[")}
- move right {renderCmdText("]")}
- new tab {renderCmdText("T")}
- {renderCmdText(String(index + 1))}
;
+ }
+ let settings = (
+ this.openScreenSettings(e, screen)} title="Actions" className="tab-gear">
+
+ );
+ let archived = screen.archived.get() ? (
+
+ ) : null;
+
+ let webShared = screen.isWebShared() ? (
+
+ ) : null;
+ return (
+ this.handleSwitchScreen(screen.screenId)}
+ onContextMenu={(event) => this.openScreenSettings(event, screen)}
+ >
+
+ );
+ }
+
+ render() {
+ let { session } = this.props;
+ if (session == null) {
+ return null;
+ }
+ let screen: Screen = null;
+ let index = 0;
+ let showingScreens = [];
+ let activeScreenId = session.activeScreenId.get();
+ let screens = GlobalModel.getSessionScreens(session.sessionId);
+ for (let screen of screens) {
+ if (!screen.archived.get() || activeScreenId == screen.screenId) {
+ showingScreens.push(screen);
+ }
+ }
+ showingScreens.sort((a, b) => {
+ let aidx = a.screenIdx.get();
+ let bidx = b.screenIdx.get();
+ if (aidx < bidx) {
+ return -1;
+ }
+ if (aidx > bidx) {
+ return 1;
+ }
+ return 0;
+ });
+ return (
+
+ {archived}
+ {webShared}
+ {screen.name.get()}
+
+ {tabIndex}
+ {settings}
+
+
+ );
+ }
+}
+
+export { ScreenTabs };
diff --git a/src/main/sessionview/sessionview.less b/src/app/workspace/workspace.less
similarity index 100%
rename from src/main/sessionview/sessionview.less
rename to src/app/workspace/workspace.less
diff --git a/src/main/sessionview/SessionView.tsx b/src/app/workspace/workspaceview.tsx
similarity index 79%
rename from src/main/sessionview/SessionView.tsx
rename to src/app/workspace/workspaceview.tsx
index af8346be..328b4b52 100644
--- a/src/main/sessionview/SessionView.tsx
+++ b/src/app/workspace/workspaceview.tsx
@@ -4,17 +4,18 @@ import * as mobx from "mobx";
import cn from "classnames";
import dayjs from "dayjs";
import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel } from "../../model";
-import { CmdInput } from "./CmdWindow/CmdInput";
-import { ScreenView, ScreenTabs } from "./Screen/ScreenView";
-import "./sessionview.less";
+import { GlobalModel } from "../../model/model";
+import { CmdInput } from "./cmdinput/cmdinput";
+import { ScreenView } from "./screen/screenview";
+import { ScreenTabs } from "./screen/tabs";
+import "./workspace.less";
dayjs.extend(localizedFormat);
type OV
+
+ {this.renderTab(screen, activeScreenId, index)}
+
+
+ {/**
+
+
+
*/}
+ move left {renderCmdText("[")}
+ move right {renderCmdText("]")}
+ new tab {renderCmdText("T")}
+
+
+ );
+ }
+ if (model.loading.get()) {
+ let height = this.model.savedHeight;
+ return (
+ ERROR: {errorText}
+
+ loading content
+
+ );
+ }
+ let Comp = plugin.simpleComponent;
+ if (Comp == null) {
+ (no component found in plugin)
;
+ }
+ let { festate, cmdstr, exitcode } = this.props.initParams.rawCmd;
+ return (
+
+
+ );
+ }
+}
+
+export { SimpleBlobRendererModel, SimpleBlobRenderer };
diff --git a/src/main/line/renderer/fullrenderer.tsx b/src/plugins/renderer/incrementalrenderer.tsx
similarity index 95%
rename from src/main/line/renderer/fullrenderer.tsx
rename to src/plugins/renderer/incrementalrenderer.tsx
index eee5ac15..2a4d1b70 100644
--- a/src/main/line/renderer/fullrenderer.tsx
+++ b/src/plugins/renderer/incrementalrenderer.tsx
@@ -6,14 +6,14 @@ import type {
RendererPluginType,
RendererModel,
RendererContainerType,
-} from "../../../types/types";
+} from "../../types/types";
import { debounce, throttle } from "throttle-debounce";
type OV
-
-
- 0}>
-
-
- );
- }
-}
-
-export { WebShareView };
diff --git a/src/webshare/webshare-elems.tsx b/src/webshare/webshare-elems.tsx
deleted file mode 100644
index 7b73239d..00000000
--- a/src/webshare/webshare-elems.tsx
+++ /dev/null
@@ -1,859 +0,0 @@
-import * as React from "react";
-import * as mobxReact from "mobx-react";
-import * as mobx from "mobx";
-import { sprintf } from "sprintf-js";
-import { boundMethod } from "autobind-decorator";
-import { If, For, When, Otherwise, Choose } from "tsx-control-statements/components";
-import cn from "classnames";
-import { WebShareModel, getTermPtyData } from "./webshare-model";
-import * as T from "./types";
-import { isBlank } from "./util";
-import { PluginModel } from "./plugins";
-import * as lineutil from "./lineutil";
-import * as util from "./util";
-import { windowWidthToCols, windowHeightToRows, termHeightFromRows, termWidthFromCols } from "./textmeasure";
-import { debounce, throttle } from "throttle-debounce";
-import { LinesView } from "./linesview";
-import { Toggle } from "./elements";
-import { SimpleBlobRendererModel, SimpleBlobRenderer } from "./simplerenderer";
-
-type OV
-
-
-
-
- WEB SHARING 0}> ({screenList.length})
-
-
- No Active Web Shares.
-
- Share a screen using the "web share" toggle in screen/tab settings{" "} - . -
- - Share a screen using the "web share" toggle in screen/tab settings{" "} - . -
-
-
-
-
-
-
-
-
-
- this.viewInContext(screen)}>
- {this.getSSName(screen, snames)}
-
-
-
-
- open in browser
-
-
-
-
-
- this.copyShareLink(screen)}
- >
- copy link
-
-
-
-
- this.openScreenSettings(screen)}
- >
- open settings
-
-
-
-
- this.stopSharing(screen)}
- >
- stop sharing
-
-
-
-
-
-
-
- Currently limited to a maximum of 3 screens, each with up to 50 commands.
-
- Contact us on{" "} - - Discord - {" "} - to get a higher limit. -
- - Contact us on{" "} - - Discord - {" "} - to get a higher limit. -
- {lineNumStr}
-
-
-
-
-
-
-
-
-
-
- );
- }
-}
-
-@mobxReact.observer
-class WebLineCmdView extends React.Component<
- {
- line: T.WebLine;
- cmd: T.WebCmd;
- topBorder: boolean;
- width: number;
- onHeightChange: T.LineHeightChangeCallbackType;
- staticRender: boolean;
- visible: OV
-
- );
- }
-
- getTerminalRendererHeight(cmd: T.WebCmd): number {
- let { line, width } = this.props;
- let height = 42; // height of zero height terminal
- let usedRows = WebShareModel.getUsedRows(lineutil.getWebRendererContext(line), line, cmd, width);
- if (usedRows > 0) {
- height = 53 + termHeightFromRows(usedRows, WebShareModel.getTermFontSize());
- }
- return height;
- }
-
- @boundMethod
- handleExpandCmd(): void {
- mobx.action(() => {
- this.isCmdExpanded.set(true);
- })();
- }
-
- renderCmdText(cmd: T.WebCmd, remote: T.WebRemote): any {
- if (cmd == null) {
- return (
-
- (cmd not found)
-
- );
- }
- if (this.isCmdExpanded.get()) {
- return (
-
-
-
-
-
-
- {lineutil.getFullCmdText(cmd.cmdstr)}
-
-
-
-
- );
- }
-
- checkCmdText() {
- let metaElem = this.cmdTextRef.current;
- if (metaElem == null || metaElem.childNodes.length == 0) {
- return;
- }
- let metaElemWidth = metaElem.offsetWidth;
- let metaChild = metaElem.firstChild;
- let children = metaChild.childNodes;
- let childWidth = 0;
- for (let i = 0; i < children.length; i++) {
- let ch = children[i];
- childWidth += ch.offsetWidth;
- }
- let isOverflow = childWidth > metaElemWidth;
- if (isOverflow != this.isOverflow.get()) {
- mobx.action(() => {
- this.isOverflow.set(isOverflow);
- })();
- }
- }
-
- @boundMethod
- handleHeightChange(): void {
- let { line } = this.props;
- let curHeight = 0;
- let curWidth = 0;
- let elem = this.lineRef.current;
- if (elem != null) {
- curHeight = elem.offsetHeight;
- curWidth = elem.offsetWidth;
- }
- if (this.lastHeight == curHeight) {
- return;
- }
- let lastHeight = this.lastHeight;
- this.lastHeight = curHeight;
- this.props.onHeightChange(line.linenum, curHeight, lastHeight);
- // console.log("line height change: ", line.linenum, lastHeight, "=>", curHeight);
- }
-
- @boundMethod
- handleClick(): void {
- WebShareModel.setSelectedLine(this.props.line.linenum);
- }
-
- renderMetaWrap() {
- let { line, cmd } = this.props;
- let formattedTime = lineutil.getLineDateTimeStr(line.ts);
- let termOpts = cmd.termopts;
- let remote = cmd.remote;
- let renderer = line.renderer;
- return (
-
-
-
- ...▼
-
-
-
- );
- }
-
- copyAllowed(): boolean {
- return navigator.clipboard != null;
- }
-
- @boundMethod
- clickCopy(): void {
- if (this.copyAllowed()) {
- let { cmd } = this.props;
- navigator.clipboard.writeText(cmd.cmdstr);
- }
- mobx.action(() => {
- this.copiedIndicator.set(true);
- })();
- setTimeout(() => {
- mobx.action(() => {
- this.copiedIndicator.set(false);
- })();
- }, 600);
- }
-
- getRendererOpts(cmd: T.WebCmd): T.RendererOpts {
- return {
- maxSize: WebShareModel.getMaxContentSize(),
- idealSize: WebShareModel.getIdealContentSize(),
- termOpts: mobx.toJS(cmd.termopts),
- termFontSize: WebShareModel.getTermFontSize(),
- };
- }
-
- makeRendererModelInitializeParams(): T.RendererModelInitializeParams {
- let { line, cmd } = this.props;
- let context = lineutil.getWebRendererContext(line);
- let savedHeight = WebShareModel.getContentHeight(context);
- if (savedHeight == null) {
- if (line.contentheight != null && line.contentheight != -1) {
- savedHeight = line.contentheight;
- } else {
- savedHeight = 0;
- }
- }
- let api = {
- saveHeight: (height: number) => {
- WebShareModel.setContentHeight(lineutil.getWebRendererContext(line), height);
- },
- onFocusChanged: (focus: boolean) => {
- // nothing
- },
- dataHandler: (data: string, model: T.RendererModel) => {
- // nothing
- },
- };
- return {
- context: context,
- isDone: !lineutil.cmdStatusIsRunning(cmd.status),
- savedHeight: savedHeight,
- opts: this.getRendererOpts(cmd),
- ptyDataSource: getTermPtyData,
- api: api,
- };
- }
-
- render() {
- let { line, cmd, topBorder, staticRender, visible } = this.props;
- let isVisible = visible.get();
- if (staticRender || !isVisible) {
- return this.renderSimple();
- }
- let model = WebShareModel;
- let isSelected = mobx
- .computed(() => model.getSelectedLine() == line.linenum, { name: "computed-isSelected" })
- .get();
- let isServerSelected = mobx
- .computed(() => model.getServerSelectedLine() == line.linenum, { name: "computed-isServerSelected" })
- .get();
- let rendererPlugin: T.RendererPluginType = null;
- let isNoneRenderer = line.renderer == "none";
- if (!isBlank(line.renderer) && line.renderer != "terminal" && !isNoneRenderer) {
- rendererPlugin = PluginModel.getRendererPluginByName(line.renderer);
- }
- let rendererType = lineutil.getRendererType(line);
- let mainCn = cn("web-line line line-cmd", { "top-border": topBorder });
- let visObs = mobx.observable.box(true, { name: "visObs" });
- let width = this.props.width;
- if (width == 0) {
- width = 1024;
- }
- let isExpanded = this.isCmdExpanded.get();
- return (
-
-
-
-
-
- {this.renderCmdText(cmd, remote)}
- {formattedTime}
-
-
- {renderer}
-
-
- ({termOpts.rows}x{termOpts.cols})
-
-
-
-
-
-
-
-
-
-
-
-
- );
- }
-}
-
-@mobxReact.observer
-class WebLineTextView extends React.Component<{ line: T.WebLine; cmd: T.WebCmd; topBorder: boolean }, {}> {
- render() {
- let { line, topBorder } = this.props;
- let model = WebShareModel;
- let isSelected = mobx
- .computed(() => model.getSelectedLine() == line.linenum, { name: "computed-isSelected" })
- .get();
- let mainCn = cn("web-line line line-text", { "top-border": topBorder });
- return (
-
-
- copied
-
-
-
-
-
-
-
-
-
-
-
-
-
- state unchanged
-
- new state
-
- {cmd.rtnstatestr}
-
-
-
- );
- }
-}
-
-@mobxReact.observer
-class TerminalRenderer extends React.Component<
- {
- line: T.WebLine;
- cmd: T.WebCmd;
- width: number;
- staticRender: boolean;
- visible: OV
-
-
-
- {line.text}
-
-
-
-
-
-
-
-
- );
- }
-}
-
-@mobxReact.observer
-class WebLineView extends React.Component<
- {
- line: T.WebLine;
- cmd: T.WebCmd;
- topBorder: boolean;
- width: number;
- onHeightChange: T.LineHeightChangeCallbackType;
- staticRender: boolean;
- visible: OV
- ...
-
- invalid linetype "{line.linetype}"
;
- }
-}
-
-@mobxReact.observer
-class WebScreenView extends React.Component<{}, {}> {
- viewRef: React.RefObject
-
- );
- }
-
- render() {
- let fullScreen = WebShareModel.fullScreen.get();
- if (fullScreen == null || fullScreen.lines.length == 0) {
- return this.renderEmpty();
- }
- return (
-
-
-
-
-
- );
- }
-}
-
-@mobxReact.observer
-class WebShareMain extends React.Component<{}, {}> {
- renderCopy() {
- return © 2023 Dashborg Inc
;
- }
-
- render() {
- let screen = WebShareModel.fullScreen.get();
- let errMessage = WebShareModel.errMessage.get();
- let shareName = "";
- if (screen != null) {
- shareName = isBlank(screen.screen.sharename) ? "(no name)" : screen.screen.sharename;
- }
- return (
-
-
- );
- }
-}
-
-export { WebShareMain };
diff --git a/src/webshare/webshare-model.ts b/src/webshare/webshare-model.ts
deleted file mode 100644
index fe84fa6a..00000000
--- a/src/webshare/webshare-model.ts
+++ /dev/null
@@ -1,679 +0,0 @@
-import * as mobx from "mobx";
-import { sprintf } from "sprintf-js";
-import { boundMethod } from "autobind-decorator";
-import { handleJsonFetchResponse, isModKeyPress, base64ToArray } from "./util";
-import * as T from "./types";
-import { TermWrap } from "./term";
-import * as lineutil from "./lineutil";
-import * as util from "./util";
-import { windowWidthToCols, windowHeightToRows, termWidthFromCols, termHeightFromRows } from "./textmeasure";
-import { WebShareWSControl } from "./webshare-ws";
-
-// @ts-ignore
-let PROMPT_DEV = __PROMPT_DEV__;
-// @ts-ignore
-let PROMPT_VERSION = __PROMPT_VERSION__;
-// @ts-ignore
-let PROMPT_BULILD = __PROMPT_BUILD__;
-// @ts-ignore
-let PROMPT_API_ENDPOINT = __PROMPT_API_ENDPOINT__;
-// @ts-ignore
-let PROMPT_WSAPI_ENDPOINT = __PROMPT_WSAPI_ENDPOINT__;
-
-type OV
-
-
-
- [prompt]
-
-
-
-
- Download Prompt
-
-
-
-
-
-
- {shareName}
-
-
- WebShareModel.setSyncSelectedLine(val)}
- />
-
- Sync Selection
-
-
-
-
-
-
- {WebShareModel.errMessage.get()}
-
- {this.renderCopy()}
-
-
-
-
-
- Discord
-
-
-