Skip to content

fix: pod excution #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 21, 2022
Merged

fix: pod excution #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
526557f
feat: add width ajustment
nibilin33 Nov 21, 2022
902955d
fix: Focused pod not executed #58
nibilin33 Nov 21, 2022
8b5027a
Revert "feat: add width ajustment"
nibilin33 Nov 21, 2022
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
2 changes: 2 additions & 0 deletions ui/src/components/Canvas.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@ const CodeNode = memo<Props>(({ data, id, isConnectable }) => {
const { setNodes } = useReactFlow();
// const selected = useStore(store, (state) => state.selected);
const setSelected = useStore(store, (state) => state.setSelected);
const setCurrentEditor = useStore(store, (state) => state.setCurrentEditor);
const getPod = useStore(store, (state) => state.getPod);
const pod = getPod(id);

Expand Down Expand Up @@ -385,6 +386,7 @@ const CodeNode = memo<Props>(({ data, id, isConnectable }) => {
}}
onFocus={() => {
setIsEditorBlur(false);
setCurrentEditor(id);
}}
/>
{showResult && (
Expand Down
7 changes: 5 additions & 2 deletions ui/src/components/MyMonaco.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,12 +329,15 @@ export const MyMonaco = memo<MyMonacoProps>(function MyMonaco({
const setPodContent = useStore(store, (state) => state.setPodContent);
const clearResults = useStore(store, (s) => s.clearResults);
const wsRun = useStore(store, (state) => state.wsRun);

const value = getPod(id).content || "";
let lang = getPod(id).lang || "javascript";
const onChange = (value) => setPodContent({ id, content: value });
const onRun = () => {
clearResults(id);
wsRun(id);
// it's MonacoEditor's bug microsoft/monaco-editor#2947, it always triggered the last created instance
const activeId = store.getState().currentEditor;
clearResults(activeId);
wsRun(activeId);
};

if (lang === "racket") {
Expand Down
10 changes: 7 additions & 3 deletions ui/src/lib/store.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ if (window.location.protocol === "http:") {
}
console.log("yjs server url: ", serverURL);

export const RepoContext = createContext<StoreApi<
RepoSlice & RuntimeSlice
> | null>(null);
export const RepoContext =
createContext<StoreApi<RepoSlice & RuntimeSlice> | null>(null);

// TODO use a selector to compute and retrieve the status
// TODO this need to cooperate with syncing indicator
Expand Down Expand Up @@ -85,6 +84,8 @@ const initialState = {
socketIntervalId: null,
// keep different seletced info on each user themselves
selected: null,
// to fixed maco editor command bug
currentEditor: null,
//TODO: all presence information are now saved in clients map for future usage. create a modern UI to show those information from clients (e.g., online users)
clients: new Map(),
showLineNumbers: false,
Expand Down Expand Up @@ -180,6 +181,8 @@ export interface RepoSlice {
setPodParent: ({ id, parent }: any) => void;
selected: string | null;
setSelected: (id: string | null) => void;
currentEditor: string | null;
setCurrentEditor: (id: string | null) => void;
setUser: (user: any) => void;
addClient: (clientId: any, name, color) => void;
deleteClient: (clientId: any) => void;
Expand Down Expand Up @@ -238,6 +241,7 @@ const createRepoSlice: StateCreator<
addError: (error) => set({ error }),
clearError: () => set({ error: null }),
setSelected: (id) => set({ selected: id }),
setCurrentEditor: (id) => set({ currentEditor: id }),
addPod: async (
client,
{ parent, index, anchor, shift, id, type, lang, x, y, width, height }
Expand Down