Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/prettier.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/waveterm.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,3 +115,4 @@ Sponsorship helps support the time spent building and maintaining the project.
## License

Wave Terminal is licensed under the Apache-2.0 License. For more information on our dependencies, see [here](./ACKNOWLEDGEMENTS.md).

10 changes: 9 additions & 1 deletion electron-builder.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ const fs = require("fs");
const path = require("path");

const windowsShouldSign = !!process.env.SM_CODE_SIGNING_CERT_SHA1_HASH;
const windowsShouldEditExecutable = windowsShouldSign || process.env.WAVETERM_WINDOWS_EDIT_EXECUTABLE === "1";
const windowsShouldBuildInstallers = windowsShouldSign || process.env.WAVETERM_WINDOWS_INSTALLERS === "1";
const windowsTargets = windowsShouldBuildInstallers ? ["nsis", "msi", "zip"] : ["zip"];
const localWindowsElectronDist = path.resolve(__dirname, "node_modules", "electron", "dist");
const useLocalWindowsElectronDist =
process.platform === "win32" && fs.existsSync(path.join(localWindowsElectronDist, "electron.exe"));

/**
* @type {import('electron-builder').Configuration}
Expand All @@ -18,6 +24,7 @@ const config = {
npmRebuild: false,
nodeGypRebuild: false,
electronCompile: false,
electronDist: useLocalWindowsElectronDist ? localWindowsElectronDist : null,
files: [
{
from: "./dist",
Expand Down Expand Up @@ -96,7 +103,8 @@ const config = {
afterInstall: "build/deb-postinstall.tpl",
},
win: {
target: ["nsis", "msi", "zip"],
target: windowsTargets,
signAndEditExecutable: windowsShouldEditExecutable,
signtoolOptions: windowsShouldSign && {
signingHashAlgorithms: ["sha256"],
publisherName: "Command Line Inc",
Expand Down
3 changes: 3 additions & 0 deletions emain/emain-platform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ function getWaveConfigDir(): string {
retVal = override;
} else if (xdgConfigHome) {
retVal = path.join(xdgConfigHome, waveDirName);
} else if (unamePlatform === "win32") {
const legacyConfigDir = path.join(app.getPath("home"), ".config", waveDirName);
retVal = existsSync(legacyConfigDir) ? legacyConfigDir : paths.config;
} else {
retVal = path.join(app.getPath("home"), ".config", waveDirName);
}
Expand Down
133 changes: 76 additions & 57 deletions frontend/app/view/preview/preview-directory.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ function DirectoryTable({
);

const setEntryManagerProps = useSetAtom(entryManagerOverlayPropsAtom);
const canCreateEntries = useAtomValue(model.statFile).supportsmkdir ?? true;
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated

const updateName = useCallback(
(path: string, isDir: boolean) => {
Expand Down Expand Up @@ -228,8 +229,8 @@ function DirectoryTable({
enableSortingRemoval: false,
meta: {
updateName,
newFile,
newDirectory,
newFile: canCreateEntries ? newFile : () => {},
newDirectory: canCreateEntries ? newDirectory : () => {},
},
});
const sortingState = table.getState().sorting;
Expand Down Expand Up @@ -326,6 +327,7 @@ function TableBody({
const dummyLineRef = useRef<HTMLDivElement>(null);
const warningBoxRef = useRef<HTMLDivElement>(null);
const conn = useAtomValue(model.connection);
const canCreateEntries = useAtomValue(model.statFile).supportsmkdir ?? true;
const setErrorMsg = useSetAtom(model.errorMsgAtom);

useEffect(() => {
Expand Down Expand Up @@ -368,28 +370,33 @@ function TableBody({
return;
}
const fileName = finfo.path.split("/").pop();
const menu: ContextMenuItem[] = [
{
label: "New File",
click: () => {
table.options.meta.newFile();
const menu: ContextMenuItem[] = [];
if (canCreateEntries) {
menu.push(
{
label: "New File",
click: () => {
table.options.meta.newFile();
},
},
},
{
label: "New Folder",
click: () => {
table.options.meta.newDirectory();
{
label: "New Folder",
click: () => {
table.options.meta.newDirectory();
},
},
},
{
label: "Rename",
click: () => {
table.options.meta.updateName(finfo.path, finfo.isdir);
{
label: "Rename",
click: () => {
table.options.meta.updateName(finfo.path, finfo.isdir);
},
},
},
{
type: "separator",
},
{
type: "separator",
}
);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
menu.push(
{
label: "Copy File Name",
click: () => fireAndForget(() => navigator.clipboard.writeText(fileName)),
Expand All @@ -405,28 +412,30 @@ function TableBody({
{
label: "Copy Full File Name (Shell Quoted)",
click: () => fireAndForget(() => navigator.clipboard.writeText(shellQuote([finfo.path]))),
},
];
addOpenMenuItems(menu, conn, finfo);
menu.push(
{
type: "separator",
},
{
label: "Default Settings",
submenu: makeDirectoryDefaultMenuItems(model),
},
{
type: "separator",
},
{
label: "Delete",
click: () => handleFileDelete(model, finfo.path, false, setErrorMsg),
}
);
addOpenMenuItems(menu, conn, finfo);
menu.push({
type: "separator",
});
menu.push({
label: "Default Settings",
submenu: makeDirectoryDefaultMenuItems(model),
});
if (canCreateEntries) {
menu.push(
{
type: "separator",
},
{
label: "Delete",
click: () => handleFileDelete(model, finfo.path, false, setErrorMsg),
}
);
}
ContextMenuModel.getInstance().showContextMenu(menu, e);
},
[setRefreshVersion, conn]
[canCreateEntries, setRefreshVersion, conn]
);

const allRows = table.getRowModel().flatRows;
Expand Down Expand Up @@ -571,6 +580,7 @@ function DirectoryPreview({ model }: DirectoryPreviewProps) {
const conn = useAtomValue(model.connection);
const blockData = useAtomValue(model.blockAtom);
const finfo = useAtomValue(model.statFile);
const canCreateEntries = finfo?.supportsmkdir ?? true;
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
const dirPath = finfo?.path;
const setErrorMsg = useSetAtom(model.errorMsgAtom);

Expand Down Expand Up @@ -796,6 +806,9 @@ function DirectoryPreview({ model }: DirectoryPreviewProps) {
const { getReferenceProps, getFloatingProps } = useInteractions([dismiss]);

const newFile = useCallback(() => {
if (!canCreateEntries) {
return;
}
setEntryManagerProps({
entryManagerType: EntryManagerType.NewFile,
onSave: (newName: string) => {
Expand All @@ -815,8 +828,11 @@ function DirectoryPreview({ model }: DirectoryPreviewProps) {
setEntryManagerProps(undefined);
},
});
}, [dirPath]);
}, [canCreateEntries, dirPath]);
const newDirectory = useCallback(() => {
if (!canCreateEntries) {
return;
}
setEntryManagerProps({
entryManagerType: EntryManagerType.NewDirectory,
onSave: (newName: string) => {
Expand All @@ -832,34 +848,37 @@ function DirectoryPreview({ model }: DirectoryPreviewProps) {
setEntryManagerProps(undefined);
},
});
}, [dirPath]);
}, [canCreateEntries, dirPath]);

const handleFileContextMenu = useCallback(
(e: any) => {
e.preventDefault();
e.stopPropagation();
const menu: ContextMenuItem[] = [
{
label: "New File",
click: () => {
newFile();
const menu: ContextMenuItem[] = [];
if (canCreateEntries) {
menu.push(
{
label: "New File",
click: () => {
newFile();
},
},
},
{
label: "New Folder",
click: () => {
newDirectory();
{
label: "New Folder",
click: () => {
newDirectory();
},
},
},
{
type: "separator",
},
];
{
type: "separator",
}
);
}
addOpenMenuItems(menu, conn, finfo);

ContextMenuModel.getInstance().showContextMenu(menu, e);
},
[setRefreshVersion, conn, newFile, newDirectory, dirPath]
[canCreateEntries, setRefreshVersion, conn, newFile, newDirectory, dirPath]
);

return (
Expand Down
24 changes: 24 additions & 0 deletions frontend/app/view/term/termutil.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { describe, expect, it } from "vitest";

import { getWheelLineDelta } from "./termutil";

describe("getWheelLineDelta", () => {
it("converts pixel deltas using cell height", () => {
expect(getWheelLineDelta(32, 0, 16, 40)).toBe(2);
expect(getWheelLineDelta(-24, 0, 12, 40)).toBe(-2);
});

it("keeps line deltas unchanged", () => {
expect(getWheelLineDelta(3, 1, 16, 40)).toBe(3);
expect(getWheelLineDelta(-2, 1, 16, 40)).toBe(-2);
});

it("converts page deltas using row count", () => {
expect(getWheelLineDelta(1, 2, 16, 30)).toBe(30);
expect(getWheelLineDelta(-1, 2, 16, 18)).toBe(-18);
});

it("falls back to sane defaults for invalid dimensions", () => {
expect(getWheelLineDelta(16, 0, 0, 0)).toBe(1);
});
});
16 changes: 16 additions & 0 deletions frontend/app/view/term/termutil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -393,3 +393,19 @@ export function bufferLinesToText(buffer: TermTypes.IBuffer, startIndex: number,
export function quoteForPosixShell(filePath: string): string {
return "'" + filePath.replace(/'/g, "'\\''") + "'";
}

export function getWheelLineDelta(deltaY: number, deltaMode: number, cellHeight: number, rows: number): number {
if (!Number.isFinite(deltaY) || deltaY === 0) {
return 0;
}
const safeCellHeight = Number.isFinite(cellHeight) && cellHeight > 0 ? cellHeight : 16;
const safeRows = Number.isFinite(rows) && rows > 0 ? rows : 1;
switch (deltaMode) {
case 1:
return deltaY;
case 2:
return deltaY * safeRows;
default:
return deltaY / safeCellHeight;
}
}
Loading