Skip to content

Commit 5e71413

Browse files
christianalfoniSaraVieira
authored andcommitted
Live fixes (codesandbox#2405)
* Fix selection issue * Fix updated messages for modules and directories * Fix moving directories and refactor a bit
1 parent 6b16df9 commit 5e71413

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

packages/app/src/app/overmind/effects/live/index.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,17 +149,18 @@ export default {
149149
}
150150
});
151151
},
152-
sendModuleUpdate(moduleShortid: string, module?: Module) {
153-
return this.send('module:saved', {
152+
sendModuleUpdate(module: Module) {
153+
return this.send('module:updated', {
154154
type: 'module',
155-
moduleShortid,
155+
moduleShortid: module.shortid,
156156
module,
157157
});
158158
},
159-
sendDirectoryUpdate(directoryShortid: string) {
160-
return this.send('module:saved', {
161-
type: 'module',
162-
directoryShortid,
159+
sendDirectoryUpdate(directory: Directory) {
160+
return this.send('directory:updated', {
161+
type: 'directory',
162+
directoryShortid: directory.shortid,
163+
module: directory,
163164
});
164165
},
165166
sendCodeUpdate(moduleShortid: string, currentCode: string, code: string) {

packages/app/src/app/overmind/namespaces/editor/actions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ export const renameModule: AsyncAction<{
566566
);
567567

568568
if (state.live.isCurrentEditor) {
569-
effects.live.sendModuleUpdate(moduleShortid);
569+
effects.live.sendModuleUpdate(module);
570570
}
571571
} catch (error) {
572572
module.title = oldTitle;

packages/app/src/app/overmind/namespaces/editor/internalActions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export const saveCode: AsyncAction<{
103103
}
104104

105105
if (state.live.isLive && state.live.isCurrentEditor) {
106-
effects.live.sendModuleUpdate(module.shortid);
106+
effects.live.sendModuleUpdate(module);
107107
}
108108

109109
await actions.editor.internal.updateCurrentTemplate();

packages/app/src/app/overmind/namespaces/files/actions.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const moduleRenamed: AsyncAction<{
3131
await effects.api.saveModuleTitle(sandbox.id, moduleShortid, title);
3232

3333
if (state.live.isCurrentEditor) {
34-
effects.live.sendModuleUpdate(moduleShortid, module);
34+
effects.live.sendModuleUpdate(module);
3535
}
3636
} catch (error) {
3737
module.title = oldTitle;
@@ -104,7 +104,7 @@ export const moduleMovedToDirectory: AsyncAction<{
104104
moduleShortid,
105105
directoryShortid
106106
);
107-
effects.live.sendModuleUpdate(moduleShortid);
107+
effects.live.sendModuleUpdate(module);
108108
} catch (error) {
109109
module.directoryShortid = currentDirectoryShortid;
110110

@@ -131,7 +131,7 @@ export const directoryMovedToDirectory: AsyncAction<{
131131
shortid,
132132
directoryShortid
133133
);
134-
effects.live.sendDirectoryUpdate(directoryShortid);
134+
effects.live.sendDirectoryUpdate(directoryToMove);
135135
} catch (error) {
136136
directoryToMove.directoryShortid = shortid;
137137
effects.notificationToast.error('Could not save new directory location');
@@ -171,7 +171,7 @@ export const directoryRenamed: AsyncAction<{
171171
title: string;
172172
directoryShortid: string;
173173
}> = withOwnedSandbox(
174-
async ({ actions, effects, state }, { title, directoryShortid }) => {
174+
async ({ effects, state }, { title, directoryShortid }) => {
175175
const sandbox = state.editor.currentSandbox;
176176
const directory = sandbox.directories.find(
177177
directoryEntry => directoryEntry.shortid === directoryShortid
@@ -184,7 +184,7 @@ export const directoryRenamed: AsyncAction<{
184184
await effects.api.saveDirectoryTitle(sandbox.id, directoryShortid, title);
185185

186186
if (state.live.isCurrentEditor) {
187-
effects.live.sendDirectoryUpdate(directoryShortid);
187+
effects.live.sendDirectoryUpdate(directory);
188188
}
189189
} catch (error) {
190190
directory.title = oldTitle;

0 commit comments

Comments
 (0)