fix: proper focus changes
This commit is contained in:
@@ -11,19 +11,25 @@ export default async function Command() {
|
|||||||
throw new Error(stderr);
|
throw new Error(stderr);
|
||||||
}
|
}
|
||||||
|
|
||||||
const { stdout: spacesOutput } = await runYabaiCommand(`-m query --spaces --space mouse`);
|
const { stdout: spacesOutput } = await runYabaiCommand(`-m query --spaces`);
|
||||||
const space = JSON.parse(spacesOutput);
|
const { stdout: spaceOutput } = await runYabaiCommand(`-m query --spaces --space mouse`);
|
||||||
|
const spaces = JSON.parse(spacesOutput);
|
||||||
const { stderr: stderr2 } = await runYabaiCommand(`-m space last --move ${space.index+1}`);
|
const currentSpace = JSON.parse(spaceOutput);
|
||||||
|
|
||||||
|
if (spaces.length - currentSpace.index > 2) {
|
||||||
|
const { stderr: stderr2 } = await runYabaiCommand(`-m space last --move ${currentSpace.index + 1}`);
|
||||||
if (stderr2) {
|
if (stderr2) {
|
||||||
console.log(stderr2);
|
console.log(stderr2);
|
||||||
throw new Error(stderr2);
|
throw new Error(stderr2);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const { stderr: stderr3 } = await runYabaiCommand(`-m space --focus ${currentSpace.index + 1}`);
|
||||||
|
|
||||||
|
if (stderr3) {
|
||||||
await runYabaiCommand(`-m space --focus next`);
|
console.log(stderr3);
|
||||||
|
throw new Error(stderr3);
|
||||||
|
}
|
||||||
|
|
||||||
showHUD(`Created space`);
|
showHUD(`Created space`);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
@@ -4,7 +4,21 @@ import { showFailureToast } from "@raycast/utils";
|
|||||||
|
|
||||||
export default async function Command() {
|
export default async function Command() {
|
||||||
try {
|
try {
|
||||||
const { stderr } = await runYabaiCommand(`-m space --destroy`);
|
const { stdout: spaceOutput } = await runYabaiCommand(`-m query --spaces --space mouse`);
|
||||||
|
const currentSpace = JSON.parse(spaceOutput);
|
||||||
|
let moveFocusIndex = currentSpace.index - 1;
|
||||||
|
|
||||||
|
if (currentSpace.index === 0) {
|
||||||
|
moveFocusIndex = currentSpace.index + 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
const { stderr: stderr3 } = await runYabaiCommand(`-m space --focus ${moveFocusIndex}`);
|
||||||
|
if (stderr3) {
|
||||||
|
console.log(stderr3);
|
||||||
|
throw new Error(stderr3);
|
||||||
|
}
|
||||||
|
|
||||||
|
const { stderr } = await runYabaiCommand(`-m space --destroy ${currentSpace.index}`);
|
||||||
|
|
||||||
if (stderr) {
|
if (stderr) {
|
||||||
throw new Error(stderr);
|
throw new Error(stderr);
|
||||||
|
|||||||
Reference in New Issue
Block a user