Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-01-19 21:11:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

implement web:hidenav (#1639), and file:/// urls (#1638) (#1645)

Browse Source
This commit is contained in:
Mike Sawka 2024-12-30 16:51:00 -08:00 committed by GitHub
parent 2590ad037d
commit 91a54442b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 74 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
frontend/app/view/webview/webview.tsx
View File

@ -51,6 +51,7 @@ export class WebViewModel implements ViewModel {
mediaMuted: PrimitiveAtom<boolean>;
modifyExternalUrl?: (url: string) => string;
domReady: PrimitiveAtom<boolean>;
hideNav: Atom<boolean>;
searchAtoms?: SearchAtoms;
constructor(blockId: string, nodeModel: BlockNodeModel) {
@ -74,6 +75,7 @@ export class WebViewModel implements ViewModel {
this.urlInputRef = createRef<HTMLInputElement>();
this.webviewRef = createRef<WebviewTag>();
this.domReady = atom(false);
this.hideNav = getBlockMetaKeyAtom(blockId, "web:hidenav");
this.mediaPlaying = atom(false);
this.mediaMuted = atom(false);
@ -87,57 +89,66 @@ export class WebViewModel implements ViewModel {
const mediaPlaying = get(this.mediaPlaying);
const mediaMuted = get(this.mediaMuted);
const url = currUrl ?? metaUrl ?? homepageUrl;
return [
{
const rtn: HeaderElem[] = [];
if (get(this.hideNav)) {
return rtn;
}
rtn.push({
elemtype: "iconbutton",
icon: "chevron-left",
click: this.handleBack.bind(this),
disabled: this.shouldDisableBackButton(),
});
rtn.push({
elemtype: "iconbutton",
icon: "chevron-right",
click: this.handleForward.bind(this),
disabled: this.shouldDisableForwardButton(),
});
rtn.push({
elemtype: "iconbutton",
icon: "house",
click: this.handleHome.bind(this),
disabled: this.shouldDisableHomeButton(),
});
const divChildren: HeaderElem[] = [];
divChildren.push({
elemtype: "input",
value: url,
ref: this.urlInputRef,
className: "url-input",
onChange: this.handleUrlChange.bind(this),
onKeyDown: this.handleKeyDown.bind(this),
onFocus: this.handleFocus.bind(this),
onBlur: this.handleBlur.bind(this),
});
if (mediaPlaying) {
divChildren.push({
elemtype: "iconbutton",
icon: "chevron-left",
click: this.handleBack.bind(this),
disabled: this.shouldDisableBackButton(),
},
{
elemtype: "iconbutton",
icon: "chevron-right",
click: this.handleForward.bind(this),
disabled: this.shouldDisableForwardButton(),
},
{
elemtype: "iconbutton",
icon: "house",
click: this.handleHome.bind(this),
disabled: this.shouldDisableHomeButton(),
},
{
elemtype: "div",
className: clsx("block-frame-div-url", urlWrapperClassName),
onMouseOver: this.handleUrlWrapperMouseOver.bind(this),
onMouseOut: this.handleUrlWrapperMouseOut.bind(this),
children: [
{
elemtype: "input",
value: url,
ref: this.urlInputRef,
className: "url-input",
onChange: this.handleUrlChange.bind(this),
onKeyDown: this.handleKeyDown.bind(this),
onFocus: this.handleFocus.bind(this),
onBlur: this.handleBlur.bind(this),
},
mediaPlaying && {
elemtype: "iconbutton",
icon: mediaMuted ? "volume-slash" : "volume",
click: this.handleMuteChange.bind(this),
},
{
elemtype: "iconbutton",
icon: refreshIcon,
click: this.handleRefresh.bind(this),
},
].filter((v) => v),
},
] as HeaderElem[];
icon: mediaMuted ? "volume-slash" : "volume",
click: this.handleMuteChange.bind(this),
});
}
divChildren.push({
elemtype: "iconbutton",
icon: refreshIcon,
click: this.handleRefresh.bind(this),
});
rtn.push({
elemtype: "div",
className: clsx("block-frame-div-url", urlWrapperClassName),
onMouseOver: this.handleUrlWrapperMouseOver.bind(this),
onMouseOut: this.handleUrlWrapperMouseOut.bind(this),
children: divChildren,
});
return rtn;
});
this.endIconButtons = atom((get) => {
if (get(this.hideNav)) {
return null;
}
const url = get(this.url);
return [
{
@ -308,7 +319,7 @@ export class WebViewModel implements ViewModel {
url = "";
}
if (/^(http|https):/.test(url)) {
if (/^(http|https|file):/.test(url)) {
// If the URL starts with http: or https:, return it as is
return url;
}
@ -494,6 +505,7 @@ export class WebViewModel implements ViewModel {
zoomSubMenu.push(makeZoomFactorMenuItem("175%", 1.75));
zoomSubMenu.push(makeZoomFactorMenuItem("200%", 2));
const isNavHidden = globalStore.get(this.hideNav);
return [
{
label: "Set Block Homepage",
@ -506,6 +518,16 @@ export class WebViewModel implements ViewModel {
{
type: "separator",
},
{
label: isNavHidden ? "Un-Hide Navigation" : "Hide Navigation",
click: () =>
fireAndForget(() => {
return RpcApi.SetMetaCommand(TabRpcClient, {
oref: WOS.makeORef("block", this.blockId),
meta: { "web:hidenav": !isNavHidden },
});
}),
},
{
label: "Set Zoom Factor",
submenu: zoomSubMenu,

1
frontend/types/gotypes.d.ts vendored
View File

@ -494,6 +494,7 @@ declare global {
"term:vdomtoolbarblockid"?: string;
"term:transparency"?: number;
"web:zoom"?: number;
"web:hidenav"?: boolean;
"markdown:fontsize"?: number;
"markdown:fixedfontsize"?: number;
"vdom:*"?: boolean;

1
pkg/waveobj/metaconsts.go
View File

@ -96,6 +96,7 @@ const (
MetaKey_TermTransparency = "term:transparency"
MetaKey_WebZoom = "web:zoom"
MetaKey_WebHideNav = "web:hidenav"
MetaKey_MarkdownFontSize = "markdown:fontsize"
MetaKey_MarkdownFixedFontSize = "markdown:fixedfontsize"

3
pkg/waveobj/wtypemeta.go
View File

@ -96,7 +96,8 @@ type MetaTSType struct {
TermVDomToolbarBlockId string `json:"term:vdomtoolbarblockid,omitempty"`
TermTransparency *float64 `json:"term:transparency,omitempty"` // default 0.5
WebZoom float64 `json:"web:zoom,omitempty"`
WebZoom float64 `json:"web:zoom,omitempty"`
WebHideNav *bool `json:"web:hidenav,omitempty"`
MarkdownFontSize float64 `json:"markdown:fontsize,omitempty"`
MarkdownFixedFontSize float64 `json:"markdown:fixedfontsize,omitempty"`