Skip to content

Commit

Permalink
FocusWidget action for the Dashboard projects
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvladic
mvladic committed Dec 29, 2024
1 parent bf3d91c commit c0aa770
Show file tree
Hide file tree
Showing 8 changed files with 170 additions and 15 deletions.
2 changes: 1 addition & 1 deletion npm-module/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"author": "Envox <[email protected]>",
"description": "EEZ Studio for building standalone dashboard applications",
"repository": "https://github.com/eez-open/studio",
"version": "0.0.54",
"version": "0.0.56",
"revision": "1",
"license": "GPL-3.0-only",
"files": ["packages", "libs", "resources"]
Expand Down
9 changes: 0 additions & 9 deletions packages/home/main.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import { LineMarkers } from "project-editor/flow/connection-line/ConnectionLineC

import "home/settings";
import { extensionsCatalog } from "./extensions-manager/catalog";
import { initProjectEditor } from "project-editor/project-editor-bootstrap";
import { buildProject } from "home/build-project";
import { layoutModels } from "eez-studio-ui/side-dock";

Expand Down Expand Up @@ -84,14 +83,6 @@ ipcRenderer.on(
}
);

ipcRenderer.on("show-documentation-browser", async () => {
const { showDocumentationBrowser } = await import(
"home/documentation-browser"
);
await initProjectEditor(tabs, ProjectEditorTab);
showDocumentationBrowser();
});

ipcRenderer.on("show-about-box", async () => {
showAboutBox();
});
Expand Down
16 changes: 16 additions & 0 deletions packages/home/tabs-store.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1331,3 +1331,19 @@ export function openProject(filePath: string, runMode: boolean) {
console.error(err);
}
}

ipcRenderer.on("show-documentation-browser", async () => {
if (
tabs.activeTab instanceof ProjectEditorTab &&
tabs.activeTab.projectStore &&
tabs.activeTab.projectStore.runtime
) {
return;
}

const { showDocumentationBrowser } = await import(
"home/documentation-browser"
);
await initProjectEditor(tabs, ProjectEditorTab);
showDocumentationBrowser();
});
12 changes: 8 additions & 4 deletions packages/project-editor/flow/components/actions/file.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ registerActionComponents("File", [
name: "encoding",
type: "expression",
valueType: "string",
formText: `"ascii", "base64", "hex", "ucs2", "ucs-2", "utf16le", "utf-16le", "utf8", "utf-8", "binary" or "latin1"`
formText: `"ascii", "base64", "hex", "ucs2", "ucs-2", "utf16le", "utf-16le", "utf8", "utf-8", "utf8-bom", "binary" or "latin1"`
}
],
execute: (context: IDashboardComponentContext) => {
Expand All @@ -157,12 +157,14 @@ registerActionComponents("File", [
return;
}

const encodingValue = context.evalProperty("encoding");
let encodingValue = context.evalProperty("encoding");
if (typeof encodingValue != "string") {
context.throwError("${encoding} is not a string");
return;
}

let contentValue = context.evalProperty("content");

const encodings = [
"ascii",
"base64",
Expand All @@ -176,6 +178,10 @@ registerActionComponents("File", [
"binary",
"latin1"
];
if (encodingValue == "utf8-bom") {
encodingValue = "utf8";
contentValue = "\ufeff" + contentValue;
}
if (encodings.indexOf(encodingValue) == -1) {
context.throwError(
`Unsupported encoding value ${encodingValue}, supported: ${encodings.join(
Expand All @@ -185,8 +191,6 @@ registerActionComponents("File", [
return;
}

const contentValue = context.evalProperty("content");

context = context.startAsyncExecution();

(async function () {
Expand Down
107 changes: 107 additions & 0 deletions packages/project-editor/flow/components/actions/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ import {
CALL_ACTION_ICON,
CALL_NATIVE_ACTION_ICON,
CLIPBOARD_WRITE_ICON,
FOCUS_WIDGET_ICON,
LANGUAGE_ICON,
LOG_ICON,
PALETTE_ICON,
Expand Down Expand Up @@ -4835,6 +4836,110 @@ export class PrintToPDFActionComponent extends ActionComponent {

////////////////////////////////////////////////////////////////////////////////

export class FocusWidgetActionComponent extends ActionComponent {
static classInfo = makeDerivedClassInfo(ActionComponent.classInfo, {
componentPaletteGroupName: "GUI",
properties: [
makeExpressionProperty(
{
name: "widget",
type: PropertyType.MultilineText,
propertyGridGroup: specificGroup
},
"widget"
)
],
defaultValue: {},
icon: FOCUS_WIDGET_ICON,
componentHeaderColor: "#DEB887",
execute: (context: IDashboardComponentContext) => {
const widget = context.evalProperty<number>("widget");
if (widget == undefined) {
context.throwError(`Invalid Widget property`);
return;
}

const widgetInfo =
context.WasmFlowRuntime.getWidgetHandleInfo(widget);

if (!widgetInfo) {
context.throwError(`Invalid Widget handle`);
return;
}

const widgetContext = new DashboardComponentContext(
context.WasmFlowRuntime,
widgetInfo.flowStateIndex,
widgetInfo.componentIndex
);

const executionState =
widgetContext.getComponentExecutionState<any>();

if (!executionState) {
context.throwError(`Widget not initialized`);
return;
}

if (!executionState.focus) {
context.throwError(`Widget doesn't support focus`);
return;
}

executionState.focus();

context.propagateValueThroughSeqout();
}
});

widget: string;

override makeEditable() {
super.makeEditable();

makeObservable(this, {
widget: observable
});
}

getInputs() {
return [
{
name: "@seqin",
type: "any" as ValueType,
isSequenceInput: true,
isOptionalInput: true
},
...super.getInputs()
];
}

getOutputs() {
return [
{
name: "@seqout",
type: "null" as ValueType,
isSequenceOutput: true,
isOptionalOutput: true
},
...super.getOutputs()
];
}

getBody(flowContext: IFlowContext): React.ReactNode {
if (!this.widget) {
return null;
}
return (
<div className="body">
<pre>{this.widget}</pre>
</div>
);
}
}

////////////////////////////////////////////////////////////////////////////////

registerClass("StartActionComponent", StartActionComponent);
registerClass("EndActionComponent", EndActionComponent);
registerClass("InputActionComponent", InputActionComponent);
Expand Down Expand Up @@ -4902,3 +5007,5 @@ registerClass("NoopActionComponent", NoopActionComponent);
registerClass("CommentActionComponent", CommentActionComponent);

registerClass("PrintToPDFActionComponent", PrintToPDFActionComponent);

registerClass("FocusWidgetActionComponent", FocusWidgetActionComponent);
27 changes: 27 additions & 0 deletions packages/project-editor/flow/components/widgets/dashboard/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,10 @@ registerClass("TextInputWidget", TextInputWidget);

////////////////////////////////////////////////////////////////////////////////

class NumberInputDashboardExecutionState {
focus?: () => void;
}

const NumberInputDashboardWidgetElement = observer(
class NumberInputDashboardWidgetElement extends React.Component<{
className: string;
Expand All @@ -636,6 +640,16 @@ const NumberInputDashboardWidgetElement = observer(
if (this.props.flowContext.flowState && this.inputElement.current) {
this.inputElement.current.focus();
}

let executionState =
this.props.flowContext.flowState?.getComponentExecutionState<NumberInputDashboardExecutionState>(
this.props.component
);
if (executionState) {
executionState.focus = () => {
this.inputElement.current?.focus();
};
}
}

dispose: IReactionDisposer;
Expand Down Expand Up @@ -812,6 +826,18 @@ export class NumberInputDashboardWidget extends Widget {
paramExpressionType: `struct:${SLIDER_CHANGE_EVENT_STRUCT_NAME}`,
oldName: "action"
}
},

execute: (context: IDashboardComponentContext) => {
Widget.classInfo.execute!(context);

let executionState =
context.getComponentExecutionState<NumberInputDashboardExecutionState>();
if (!executionState) {
context.setComponentExecutionState<NumberInputDashboardExecutionState>(
new NumberInputDashboardExecutionState()
);
}
}
});

Expand Down Expand Up @@ -2605,3 +2631,4 @@ import "project-editor/flow/components/widgets/dashboard/embedded-dashboard";

import { assignProperty } from "project-editor/flow/runtime/worker-dashboard-component-context";
import { guid } from "eez-studio-shared/guid";
import { IDashboardComponentContext } from "eez-studio-types";
3 changes: 2 additions & 1 deletion packages/project-editor/flow/runtime/wasm-runtime.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ import { getClassByName } from "project-editor/core/object";
import { FLOW_EVENT_KEYDOWN } from "project-editor/flow/runtime/flow-events";
import { preloadAllBitmaps } from "project-editor/features/bitmap/bitmap";
import { releaseRuntimeDashboardStates } from "project-editor/flow/runtime/component-execution-states";
import { hasClass } from "eez-studio-shared/dom";
import { findBitmap } from "project-editor/project/assets";

interface IGlobalVariableBase {
Expand Down Expand Up @@ -1186,6 +1185,7 @@ export class WasmRuntime extends RemoteRuntime {
//key = e.key;
}

/*
if (e.target instanceof HTMLInputElement) {
if (
(key != "Tab" && key != "ShiftTab") ||
Expand All @@ -1208,6 +1208,7 @@ export class WasmRuntime extends RemoteRuntime {
e.preventDefault();
e.stopPropagation();
*/

let valuePtr = createWasmValue(this.worker.wasm, key);

Expand Down
9 changes: 9 additions & 0 deletions packages/project-editor/ui-components/icons.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3549,3 +3549,12 @@ export const CALL_NATIVE_ACTION_ICON: any = (
<path d="M4 18v-3.7a1.5 1.5 0 0 0-1.5-1.5H2v-1.6h.5A1.5 1.5 0 0 0 4 9.7V6a3 3 0 0 1 3-3h1v2H7a1 1 0 0 0-1 1v4.1A2 2 0 0 1 4.626 12 2 2 0 0 1 6 13.9V18a1 1 0 0 0 1 1h1v2H7a3 3 0 0 1-3-3m16-3.7V18a3 3 0 0 1-3 3h-1v-2h1a1 1 0 0 0 1-1v-4.1a2 2 0 0 1 1.374-1.9A2 2 0 0 1 18 10.1V6a1 1 0 0 0-1-1h-1V3h1a3 3 0 0 1 3 3v3.7a1.5 1.5 0 0 0 1.5 1.5h.5v1.6h-.5a1.5 1.5 0 0 0-1.5 1.5" />
</svg>
);

export const FOCUS_WIDGET_ICON: any = (
<svg viewBox="0 0 24 24">
<path
fill="currentColor"
d="M5 21q-.825 0-1.412-.587T3 19v-4h2v4h4v2zm10 0v-2h4v-4h2v4q0 .825-.587 1.413T19 21zM3 9V5q0-.825.588-1.412T5 3h4v2H5v4zm16 0V5h-4V3h4q.825 0 1.413.588T21 5v4zm-7 8q-2.075 0-3.537-1.463T7 12t1.463-3.537T12 7t3.538 1.463T17 12t-1.463 3.538T12 17"
/>
</svg>
);

0 comments on commit c0aa770

Please sign in to comment.