@elice/material-exercise 1.240718.0-trasncript.2 โ 1.240718.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cjs/assets/empty.png.js +2 -1
- package/cjs/components/material-exercise/MaterialExercise.d.ts +1 -1
- package/cjs/components/material-exercise/MaterialExercise.js +75 -111
- package/cjs/components/material-exercise/MaterialExercise.styled.js +14 -18
- package/cjs/components/material-exercise/MaterialExerciseMobile.d.ts +1 -1
- package/cjs/components/material-exercise/MaterialExerciseMobile.js +7 -17
- package/cjs/components/material-exercise/context/ExerciseProvider.js +58 -68
- package/cjs/components/material-exercise/context/ExerciseProviderNoImage.js +30 -39
- package/cjs/components/material-exercise/context/context.js +1 -5
- package/cjs/components/material-exercise/context/recoil.js +293 -542
- package/cjs/components/material-exercise/context/subjects.js +4 -4
- package/cjs/components/material-exercise/context/types.d.ts +2 -2
- package/cjs/components/material-exercise/exercise-code-history/ExerciseCodeHistory.js +78 -100
- package/cjs/components/material-exercise/exercise-code-history/ExerciseCodeHistory.styled.js +8 -12
- package/cjs/components/material-exercise/exercise-file/ExerciseFile.js +27 -30
- package/cjs/components/material-exercise/exercise-file-editor/ExerciseFileEditor.js +149 -225
- package/cjs/components/material-exercise/exercise-file-editor/ExerciseFileReadOnlyBanner.js +13 -20
- package/cjs/components/material-exercise/exercise-file-tabs/ExerciseFileTabs.js +29 -49
- package/cjs/components/material-exercise/exercise-file-tabs/ExerciseFileTabsLazy.d.ts +2 -1
- package/cjs/components/material-exercise/exercise-file-tabs/ExerciseFileTabsLazy.js +4 -10
- package/cjs/components/material-exercise/exercise-file-tabs/exercise-file-tabs-file-tree-button/ExerciseFileTabsFileTreeButton.js +36 -53
- package/cjs/components/material-exercise/exercise-file-tree/ExerciseFileTree.js +211 -353
- package/cjs/components/material-exercise/exercise-file-tree/ExerciseFileTreeLazy.d.ts +2 -1
- package/cjs/components/material-exercise/exercise-file-tree/ExerciseFileTreeLazy.js +4 -10
- package/cjs/components/material-exercise/exercise-file-viewer/ExerciseFileViewer.js +15 -18
- package/cjs/components/material-exercise/exercise-menu/ExerciseMenu.js +12 -21
- package/cjs/components/material-exercise/exercise-menu/ExerciseMenuArduinoAgentModalButton.js +11 -12
- package/cjs/components/material-exercise/exercise-menu/ExerciseMenuArduinoSettings.js +80 -123
- package/cjs/components/material-exercise/exercise-menu/ExerciseMenuDropdown.js +67 -100
- package/cjs/components/material-exercise/exercise-menu/ExerciseMenuReset.js +22 -40
- package/cjs/components/material-exercise/exercise-menu/ExerciseMenuStdioFileBrowser.js +119 -144
- package/cjs/components/material-exercise/exercise-menu/ExerciseMenuStdioFileBrowser.styled.js +13 -17
- package/cjs/components/material-exercise/exercise-multilang-dropdown/ExerciseMultilangDropdown.js +19 -32
- package/cjs/components/material-exercise/exercise-multilang-dropdown/ExerciseMultilangDropdownLazy.d.ts +2 -1
- package/cjs/components/material-exercise/exercise-multilang-dropdown/ExerciseMultilangDropdownLazy.js +4 -10
- package/cjs/components/material-exercise/exercise-preview/ExercisePreview.js +24 -31
- package/cjs/components/material-exercise/exercise-preview/ExercisePreviewDisplayModeButton.js +6 -13
- package/cjs/components/material-exercise/exercise-rightpane/ExerciseRightpane.js +35 -51
- package/cjs/components/material-exercise/exercise-rightpane/ExerciseRightpaneEditorPerference.js +6 -14
- package/cjs/components/material-exercise/exercise-rightpane/ExerciseRightpaneEnvironment.js +78 -90
- package/cjs/components/material-exercise/exercise-room/ExerciseRoom.js +12 -25
- package/cjs/components/material-exercise/exercise-room/ExerciseRoom.styled.js +12 -18
- package/cjs/components/material-exercise/exercise-room/ExerciseRoomDetail.js +349 -504
- package/cjs/components/material-exercise/exercise-room/ExerciseRoomList.js +132 -197
- package/cjs/components/material-exercise/exercise-room/helpers/exerciseRoomPermissionStringConvertor.js +2 -2
- package/cjs/components/material-exercise/exercise-runner/ExerciseRunner.js +142 -205
- package/cjs/components/material-exercise/exercise-runner/ExerciseRunnerContext.js +1 -5
- package/cjs/components/material-exercise/exercise-runner/ExerciseRunnerController.js +16 -25
- package/cjs/components/material-exercise/exercise-runner/ExerciseRunnerControllerArduinoAgentModal.js +86 -118
- package/cjs/components/material-exercise/exercise-runner/ExerciseRunnerControllerArduinoStatusMessage.js +19 -33
- package/cjs/components/material-exercise/exercise-runner/ExerciseRunnerControllerButtonGroup.js +82 -95
- package/cjs/components/material-exercise/exercise-runner/ExerciseRunnerControllerCodeHelpRequestButton.js +52 -68
- package/cjs/components/material-exercise/exercise-runner/ExerciseRunnerControllerRunningInfo.js +87 -136
- package/cjs/components/material-exercise/exercise-runner/ExerciseRunnerControllerStatusIndicator.js +2 -6
- package/cjs/components/material-exercise/exercise-runner/ExerciseRunnerControllerStatusMessage.js +15 -21
- package/cjs/components/material-exercise/exercise-runner/ExerciseRunnerControllerTimer.js +23 -36
- package/cjs/components/material-exercise/exercise-submit-history/ExerciseSubmitHistory.js +248 -402
- package/cjs/components/material-exercise/exercise-submit-history/ExerciseSubmitHistory.styled.js +8 -12
- package/cjs/components/material-exercise/exercise-submit-history/ExerciseSubmitHistoryOutput.js +50 -74
- package/cjs/components/shared/exercise-menu-button/ExerciseMenuButton.js +23 -32
- package/cjs/components/shared/exercise-shimmer/ExerciseFileShimmer.js +38 -44
- package/cjs/components/shared/exercise-shimmer/ExerciseFileTabShimmer.js +20 -26
- package/cjs/components/shared/exercise-shimmer/ExerciseFileTabsShimmer.js +8 -14
- package/cjs/components/shared/exercise-shimmer/ExerciseFileTreeListItemShimmer.js +22 -28
- package/cjs/components/shared/exercise-shimmer/ExerciseFileTreeListShimmer.js +9 -24
- package/cjs/components/shared/exercise-version-list/ExerciseVersionList.js +5 -6
- package/cjs/components/shared/exercise-version-list/ExerciseVersionList.styled.js +1 -5
- package/cjs/components/shared/exercise-version-list/ExerciseVersionListItem.js +10 -10
- package/cjs/components/shared/exercise-version-list/ExerciseVersionListItem.styled.js +5 -13
- package/cjs/components/shared/file-icon/FileIcon.js +16 -23
- package/cjs/components/shared/file-tabs/FileTab.js +33 -47
- package/cjs/components/shared/file-tabs/FileTab.styled.js +15 -23
- package/cjs/components/shared/file-tabs/FileTabs.js +39 -66
- package/cjs/components/shared/file-tabs/FileTabs.styled.js +2 -6
- package/cjs/components/shared/file-tabs/util.js +14 -27
- package/cjs/components/shared/file-tree/FileTree.js +10 -20
- package/cjs/components/shared/file-tree/FileTreeConfig.js +40 -46
- package/cjs/components/shared/file-tree/FileTreeList.js +40 -43
- package/cjs/components/shared/file-tree/FileTreeListItemContent.js +99 -128
- package/cjs/components/shared/file-tree/FileTreeListItemContent.styled.js +21 -29
- package/cjs/components/shared/file-tree/FileTreeListItemContentInput.js +96 -106
- package/cjs/components/shared/file-tree/FileTreeListItemContentInput.styled.js +6 -10
- package/cjs/components/shared/file-tree/FileTreeListItemContentMenu.js +91 -133
- package/cjs/components/shared/file-tree/FileTreeListItems.js +137 -149
- package/cjs/components/shared/file-tree/FileTreeListItems.styled.js +2 -6
- package/cjs/components/shared/file-tree/FileTreeToolbar.styled.js +1 -5
- package/cjs/components/shared/file-tree/context/FileTreeContext.d.ts +1 -1
- package/cjs/components/shared/file-tree/context/FileTreeContext.js +79 -101
- package/cjs/components/shared/file-tree/file-tree-toolbar/FileTreeToolbar.js +54 -59
- package/cjs/components/shared/file-tree/utils/fileTreeFiles.js +20 -24
- package/cjs/components/shared/file-tree/utils/fileTreeGenerator.js +146 -193
- package/cjs/components/shared/file-tree/utils/fileTreeInput.js +0 -11
- package/cjs/components/shared/file-tree/utils/fileTreeItem.js +1 -1
- package/cjs/components/shared/file-tree/utils/fileTreePath.js +6 -5
- package/cjs/components/shared/file-viewer/FileViewer.js +46 -76
- package/cjs/components/shared/file-viewer/FileViewerCsv.js +167 -262
- package/cjs/components/shared/file-viewer/FileViewerImage.js +12 -16
- package/cjs/components/shared/file-viewer/FileViewerIpynb.js +11 -27
- package/cjs/components/shared/file-viewer/FileViewerNonViewable.js +47 -65
- package/cjs/components/shared/file-viewer/FileViewerText.js +11 -23
- package/cjs/components/shared/material-modal/MaterialModal.js +11 -20
- package/cjs/components/shared/material-modal/MaterialModal.styled.js +5 -9
- package/cjs/components/shared/monaco-editor/MonacoEditor.js +74 -102
- package/cjs/components/shared/monaco-editor/MonacoEditorLazy.js +7 -15
- package/cjs/components/shared/monaco-editor/MonacoEditorMobile.js +34 -49
- package/cjs/components/shared/monaco-editor/MonacoEditorPerferenceForm.js +194 -249
- package/cjs/components/shared/monaco-editor/constants/grammars/index.js +28 -82
- package/cjs/components/shared/monaco-editor/constants/monaco/preferences.js +5 -5
- package/cjs/components/shared/monaco-editor/constants/themes/index.js +17 -49
- package/cjs/components/shared/monaco-editor/editor-hooks/useMonacoEventChange.js +10 -11
- package/cjs/components/shared/monaco-editor/editor-hooks/useMonacoEventCursor.js +14 -15
- package/cjs/components/shared/monaco-editor/editor-hooks/useMonacoEventScroll.js +8 -9
- package/cjs/components/shared/monaco-editor/editor-hooks/useMonacoMarkers.js +30 -34
- package/cjs/components/shared/monaco-editor/editor-hooks/useMonacoOptions.js +7 -9
- package/cjs/components/shared/monaco-editor/editor-hooks/useMonacoTheme.js +6 -6
- package/cjs/components/shared/monaco-editor/editor-languages/css/formatter.js +10 -33
- package/cjs/components/shared/monaco-editor/editor-languages/css/index.js +2 -3
- package/cjs/components/shared/monaco-editor/editor-languages/html/formatter.js +10 -33
- package/cjs/components/shared/monaco-editor/editor-languages/html/index.js +2 -3
- package/cjs/components/shared/monaco-editor/editor-languages/typescript/dts/_helper.js +1 -1
- package/cjs/components/shared/monaco-editor/editor-languages/typescript/formatter.js +10 -37
- package/cjs/components/shared/monaco-editor/editor-languages/typescript/index.js +5 -6
- package/cjs/components/shared/monaco-editor/hooks/useEditorOptions.js +5 -11
- package/cjs/components/shared/monaco-editor/utils/emmet/abbreviationActions.js +12 -10
- package/cjs/components/shared/monaco-editor/utils/emmet/registerProvider.js +6 -12
- package/cjs/components/shared/monaco-editor/utils/grammar/index.js +24 -67
- package/cjs/components/shared/monaco-editor/utils/grammar/onigasm.js +6 -25
- package/cjs/components/shared/monaco-editor/utils/grammar/textmate.js +37 -70
- package/cjs/components/shared/monaco-editor/utils/monacoLanguage.js +7 -8
- package/cjs/components/shared/monaco-editor/utils/monacoPreference.js +4 -6
- package/cjs/components/shared/monaco-editor/utils/prettier/config.js +2 -2
- package/cjs/components/shared/monaco-editor/utils/prettier/index.js +7 -27
- package/cjs/components/shared/monaco-editor/utils/theme/convert.js +14 -24
- package/cjs/components/shared/monaco-editor/utils/theme/index.js +3 -22
- package/cjs/components/shared/monaco-editor/vendors/monaco-collab-ext/RemoteCursor.js +56 -77
- package/cjs/components/shared/monaco-editor/vendors/monaco-collab-ext/RemoteCursorManager.js +68 -82
- package/cjs/components/shared/monaco-editor/vendors/monaco-collab-ext/RemoteCursorWidget.js +93 -120
- package/cjs/components/shared/monaco-editor/vendors/monaco-collab-ext/RemoteSelection.js +132 -155
- package/cjs/components/shared/monaco-editor/vendors/monaco-collab-ext/RemoteSelectionManager.js +92 -104
- package/cjs/components/shared/monaco-editor/vendors/monaco-collab-ext/styles.js +2 -2
- package/cjs/components/shared/monaco-editor/vendors/vscode-emmet-helper/configCompat.js +6 -1
- package/cjs/components/shared/monaco-editor/vendors/vscode-emmet-helper/data.js +2 -2
- package/cjs/components/shared/monaco-editor/vendors/vscode-emmet-helper/emmetHelper.js +158 -177
- package/cjs/components/shared/monaco-editor/vendors/vscode-emmet-helper/utils.js +3 -3
- package/cjs/components/shared/no-vnc/NoVnc.js +78 -118
- package/cjs/components/shared/no-vnc/NoVncLazy.js +7 -15
- package/cjs/components/shared/preview-container/PreviewContainer.js +13 -18
- package/cjs/components/shared/web-browser/WebBrowser.js +52 -74
- package/cjs/components/shared/xterm/Xterm.js +57 -82
- package/cjs/components/shared/xterm/XtermLazy.js +7 -15
- package/cjs/constants/arduino.js +10 -10
- package/cjs/constants/color.js +1 -1
- package/cjs/constants/shortcutKeyMap.js +1 -3
- package/cjs/constants/stylesheets.js +5 -7
- package/cjs/hooks/useArduino.js +141 -282
- package/cjs/hooks/useExerciseFile.js +22 -24
- package/cjs/hooks/useExericseShortcut.js +4 -6
- package/cjs/hooks/useMaterialExerciseFileUrl.js +33 -55
- package/cjs/hooks/useRunnerRoomWebSocket.js +27 -51
- package/cjs/hooks/useStdioTextConcator.js +11 -15
- package/cjs/hooks/useStdioWebSocket.js +28 -32
- package/cjs/hooks/useUsercodeEditWebSocket.js +158 -238
- package/cjs/hooks/useUsercodeHistory.js +63 -115
- package/cjs/utils/arduino.js +11 -23
- package/cjs/utils/exerciseFile.js +10 -8
- package/cjs/utils/runner.js +17 -33
- package/es/assets/empty.png.js +2 -1
- package/es/components/material-exercise/MaterialExercise.d.ts +1 -1
- package/es/components/material-exercise/MaterialExercise.js +75 -107
- package/es/components/material-exercise/MaterialExercise.styled.js +14 -14
- package/es/components/material-exercise/MaterialExerciseMobile.d.ts +1 -1
- package/es/components/material-exercise/MaterialExerciseMobile.js +7 -13
- package/es/components/material-exercise/context/ExerciseProvider.js +58 -63
- package/es/components/material-exercise/context/ExerciseProviderNoImage.js +30 -35
- package/es/components/material-exercise/context/context.js +1 -1
- package/es/components/material-exercise/context/recoil.js +290 -535
- package/es/components/material-exercise/context/subjects.js +4 -4
- package/es/components/material-exercise/context/types.d.ts +2 -2
- package/es/components/material-exercise/exercise-code-history/ExerciseCodeHistory.js +78 -95
- package/es/components/material-exercise/exercise-code-history/ExerciseCodeHistory.styled.js +8 -8
- package/es/components/material-exercise/exercise-file/ExerciseFile.js +27 -25
- package/es/components/material-exercise/exercise-file-editor/ExerciseFileEditor.js +149 -221
- package/es/components/material-exercise/exercise-file-editor/ExerciseFileReadOnlyBanner.js +13 -15
- package/es/components/material-exercise/exercise-file-tabs/ExerciseFileTabs.js +29 -44
- package/es/components/material-exercise/exercise-file-tabs/ExerciseFileTabsLazy.d.ts +2 -1
- package/es/components/material-exercise/exercise-file-tabs/ExerciseFileTabsLazy.js +4 -6
- package/es/components/material-exercise/exercise-file-tabs/exercise-file-tabs-file-tree-button/ExerciseFileTabsFileTreeButton.js +36 -48
- package/es/components/material-exercise/exercise-file-tree/ExerciseFileTree.js +211 -348
- package/es/components/material-exercise/exercise-file-tree/ExerciseFileTreeLazy.d.ts +2 -1
- package/es/components/material-exercise/exercise-file-tree/ExerciseFileTreeLazy.js +4 -6
- package/es/components/material-exercise/exercise-file-viewer/ExerciseFileViewer.js +15 -14
- package/es/components/material-exercise/exercise-menu/ExerciseMenu.js +12 -16
- package/es/components/material-exercise/exercise-menu/ExerciseMenuArduinoAgentModalButton.js +11 -12
- package/es/components/material-exercise/exercise-menu/ExerciseMenuArduinoSettings.js +80 -119
- package/es/components/material-exercise/exercise-menu/ExerciseMenuDropdown.js +67 -96
- package/es/components/material-exercise/exercise-menu/ExerciseMenuReset.js +23 -41
- package/es/components/material-exercise/exercise-menu/ExerciseMenuStdioFileBrowser.js +122 -143
- package/es/components/material-exercise/exercise-menu/ExerciseMenuStdioFileBrowser.styled.js +13 -13
- package/es/components/material-exercise/exercise-multilang-dropdown/ExerciseMultilangDropdown.js +19 -28
- package/es/components/material-exercise/exercise-multilang-dropdown/ExerciseMultilangDropdownLazy.d.ts +2 -1
- package/es/components/material-exercise/exercise-multilang-dropdown/ExerciseMultilangDropdownLazy.js +4 -6
- package/es/components/material-exercise/exercise-preview/ExercisePreview.js +24 -26
- package/es/components/material-exercise/exercise-preview/ExercisePreviewDisplayModeButton.js +7 -14
- package/es/components/material-exercise/exercise-rightpane/ExerciseRightpane.js +35 -47
- package/es/components/material-exercise/exercise-rightpane/ExerciseRightpaneEditorPerference.js +6 -10
- package/es/components/material-exercise/exercise-rightpane/ExerciseRightpaneEnvironment.js +78 -85
- package/es/components/material-exercise/exercise-room/ExerciseRoom.js +12 -21
- package/es/components/material-exercise/exercise-room/ExerciseRoom.styled.js +12 -14
- package/es/components/material-exercise/exercise-room/ExerciseRoomDetail.js +349 -498
- package/es/components/material-exercise/exercise-room/ExerciseRoomList.js +133 -193
- package/es/components/material-exercise/exercise-room/helpers/exerciseRoomPermissionStringConvertor.js +2 -2
- package/es/components/material-exercise/exercise-runner/ExerciseRunner.js +142 -200
- package/es/components/material-exercise/exercise-runner/ExerciseRunnerContext.js +1 -1
- package/es/components/material-exercise/exercise-runner/ExerciseRunnerController.js +16 -20
- package/es/components/material-exercise/exercise-runner/ExerciseRunnerControllerArduinoAgentModal.js +85 -112
- package/es/components/material-exercise/exercise-runner/ExerciseRunnerControllerArduinoStatusMessage.js +20 -30
- package/es/components/material-exercise/exercise-runner/ExerciseRunnerControllerButtonGroup.js +82 -90
- package/es/components/material-exercise/exercise-runner/ExerciseRunnerControllerCodeHelpRequestButton.js +52 -63
- package/es/components/material-exercise/exercise-runner/ExerciseRunnerControllerRunningInfo.js +87 -131
- package/es/components/material-exercise/exercise-runner/ExerciseRunnerControllerStatusIndicator.js +2 -2
- package/es/components/material-exercise/exercise-runner/ExerciseRunnerControllerStatusMessage.js +15 -17
- package/es/components/material-exercise/exercise-runner/ExerciseRunnerControllerTimer.js +23 -31
- package/es/components/material-exercise/exercise-submit-history/ExerciseSubmitHistory.js +250 -399
- package/es/components/material-exercise/exercise-submit-history/ExerciseSubmitHistory.styled.js +8 -8
- package/es/components/material-exercise/exercise-submit-history/ExerciseSubmitHistoryOutput.js +49 -68
- package/es/components/shared/exercise-menu-button/ExerciseMenuButton.js +24 -29
- package/es/components/shared/exercise-shimmer/ExerciseFileShimmer.js +38 -40
- package/es/components/shared/exercise-shimmer/ExerciseFileTabShimmer.js +20 -22
- package/es/components/shared/exercise-shimmer/ExerciseFileTabsShimmer.js +8 -10
- package/es/components/shared/exercise-shimmer/ExerciseFileTreeListItemShimmer.js +22 -24
- package/es/components/shared/exercise-shimmer/ExerciseFileTreeListShimmer.js +9 -19
- package/es/components/shared/exercise-version-list/ExerciseVersionList.js +5 -6
- package/es/components/shared/exercise-version-list/ExerciseVersionList.styled.js +1 -1
- package/es/components/shared/exercise-version-list/ExerciseVersionListItem.js +10 -10
- package/es/components/shared/exercise-version-list/ExerciseVersionListItem.styled.js +5 -9
- package/es/components/shared/file-icon/FileIcon.js +16 -19
- package/es/components/shared/file-tabs/FileTab.js +33 -43
- package/es/components/shared/file-tabs/FileTab.styled.js +15 -19
- package/es/components/shared/file-tabs/FileTabs.js +40 -62
- package/es/components/shared/file-tabs/FileTabs.styled.js +2 -2
- package/es/components/shared/file-tabs/util.js +14 -27
- package/es/components/shared/file-tree/FileTree.js +10 -16
- package/es/components/shared/file-tree/FileTreeConfig.js +39 -39
- package/es/components/shared/file-tree/FileTreeList.js +40 -38
- package/es/components/shared/file-tree/FileTreeListItemContent.js +99 -124
- package/es/components/shared/file-tree/FileTreeListItemContent.styled.js +21 -25
- package/es/components/shared/file-tree/FileTreeListItemContentInput.js +96 -102
- package/es/components/shared/file-tree/FileTreeListItemContentInput.styled.js +6 -6
- package/es/components/shared/file-tree/FileTreeListItemContentMenu.js +91 -129
- package/es/components/shared/file-tree/FileTreeListItems.js +137 -149
- package/es/components/shared/file-tree/FileTreeListItems.styled.js +2 -2
- package/es/components/shared/file-tree/FileTreeToolbar.styled.js +1 -1
- package/es/components/shared/file-tree/context/FileTreeContext.d.ts +1 -1
- package/es/components/shared/file-tree/context/FileTreeContext.js +79 -97
- package/es/components/shared/file-tree/file-tree-toolbar/FileTreeToolbar.js +54 -55
- package/es/components/shared/file-tree/utils/fileTreeFiles.js +20 -20
- package/es/components/shared/file-tree/utils/fileTreeGenerator.js +146 -193
- package/es/components/shared/file-tree/utils/fileTreeInput.js +1 -11
- package/es/components/shared/file-tree/utils/fileTreeItem.js +1 -1
- package/es/components/shared/file-tree/utils/fileTreePath.js +6 -5
- package/es/components/shared/file-viewer/FileViewer.js +46 -69
- package/es/components/shared/file-viewer/FileViewerCsv.js +167 -257
- package/es/components/shared/file-viewer/FileViewerImage.js +12 -12
- package/es/components/shared/file-viewer/FileViewerIpynb.js +11 -21
- package/es/components/shared/file-viewer/FileViewerNonViewable.js +47 -60
- package/es/components/shared/file-viewer/FileViewerText.js +11 -19
- package/es/components/shared/material-modal/MaterialModal.js +11 -20
- package/es/components/shared/material-modal/MaterialModal.styled.js +5 -5
- package/es/components/shared/monaco-editor/MonacoEditor.js +72 -95
- package/es/components/shared/monaco-editor/MonacoEditorLazy.js +7 -11
- package/es/components/shared/monaco-editor/MonacoEditorMobile.js +32 -43
- package/es/components/shared/monaco-editor/MonacoEditorPerferenceForm.js +194 -244
- package/es/components/shared/monaco-editor/constants/grammars/index.js +28 -82
- package/es/components/shared/monaco-editor/constants/monaco/preferences.js +5 -5
- package/es/components/shared/monaco-editor/constants/themes/index.js +17 -49
- package/es/components/shared/monaco-editor/editor-hooks/useMonacoEventChange.js +10 -11
- package/es/components/shared/monaco-editor/editor-hooks/useMonacoEventCursor.js +14 -15
- package/es/components/shared/monaco-editor/editor-hooks/useMonacoEventScroll.js +8 -9
- package/es/components/shared/monaco-editor/editor-hooks/useMonacoMarkers.js +30 -34
- package/es/components/shared/monaco-editor/editor-hooks/useMonacoOptions.js +7 -9
- package/es/components/shared/monaco-editor/editor-hooks/useMonacoTheme.js +6 -6
- package/es/components/shared/monaco-editor/editor-languages/css/formatter.js +10 -33
- package/es/components/shared/monaco-editor/editor-languages/html/formatter.js +10 -33
- package/es/components/shared/monaco-editor/editor-languages/typescript/dts/_helper.js +1 -1
- package/es/components/shared/monaco-editor/editor-languages/typescript/formatter.js +10 -37
- package/es/components/shared/monaco-editor/editor-languages/typescript/index.js +3 -3
- package/es/components/shared/monaco-editor/hooks/useEditorOptions.js +5 -11
- package/es/components/shared/monaco-editor/utils/emmet/abbreviationActions.js +12 -10
- package/es/components/shared/monaco-editor/utils/emmet/registerProvider.js +6 -12
- package/es/components/shared/monaco-editor/utils/grammar/index.js +24 -67
- package/es/components/shared/monaco-editor/utils/grammar/onigasm.js +6 -25
- package/es/components/shared/monaco-editor/utils/grammar/textmate.js +35 -67
- package/es/components/shared/monaco-editor/utils/monacoLanguage.js +5 -5
- package/es/components/shared/monaco-editor/utils/monacoPreference.js +4 -6
- package/es/components/shared/monaco-editor/utils/prettier/config.js +2 -2
- package/es/components/shared/monaco-editor/utils/prettier/index.js +7 -27
- package/es/components/shared/monaco-editor/utils/theme/convert.js +13 -19
- package/es/components/shared/monaco-editor/utils/theme/index.js +3 -22
- package/es/components/shared/monaco-editor/vendors/monaco-collab-ext/RemoteCursor.js +56 -77
- package/es/components/shared/monaco-editor/vendors/monaco-collab-ext/RemoteCursorManager.js +68 -82
- package/es/components/shared/monaco-editor/vendors/monaco-collab-ext/RemoteCursorWidget.js +93 -120
- package/es/components/shared/monaco-editor/vendors/monaco-collab-ext/RemoteSelection.js +130 -152
- package/es/components/shared/monaco-editor/vendors/monaco-collab-ext/RemoteSelectionManager.js +92 -104
- package/es/components/shared/monaco-editor/vendors/monaco-collab-ext/styles.js +2 -2
- package/es/components/shared/monaco-editor/vendors/vscode-emmet-helper/configCompat.js +6 -1
- package/es/components/shared/monaco-editor/vendors/vscode-emmet-helper/data.js +2 -2
- package/es/components/shared/monaco-editor/vendors/vscode-emmet-helper/emmetHelper.js +156 -171
- package/es/components/shared/monaco-editor/vendors/vscode-emmet-helper/utils.js +3 -3
- package/es/components/shared/no-vnc/NoVnc.js +71 -99
- package/es/components/shared/no-vnc/NoVncLazy.js +7 -11
- package/es/components/shared/preview-container/PreviewContainer.js +14 -15
- package/es/components/shared/web-browser/WebBrowser.js +52 -69
- package/es/components/shared/xterm/Xterm.js +57 -77
- package/es/components/shared/xterm/XtermLazy.js +7 -11
- package/es/constants/arduino.js +10 -10
- package/es/constants/color.js +1 -1
- package/es/constants/shortcutKeyMap.js +1 -3
- package/es/constants/stylesheets.js +5 -7
- package/es/hooks/useArduino.js +141 -278
- package/es/hooks/useExerciseFile.js +22 -24
- package/es/hooks/useExericseShortcut.js +4 -6
- package/es/hooks/useMaterialExerciseFileUrl.js +34 -52
- package/es/hooks/useRunnerRoomWebSocket.js +27 -51
- package/es/hooks/useStdioTextConcator.js +11 -11
- package/es/hooks/useStdioWebSocket.js +28 -32
- package/es/hooks/useUsercodeEditWebSocket.js +157 -232
- package/es/hooks/useUsercodeHistory.js +63 -115
- package/es/utils/arduino.js +12 -24
- package/es/utils/exerciseFile.js +10 -8
- package/es/utils/runner.js +17 -33
- package/package.json +15 -11
- package/cjs/_virtual/_rollupPluginBabelHelpers.js +0 -519
- package/cjs/components/index.js +0 -25
- package/cjs/components/locales/index.js +0 -13
- package/cjs/components/material-exercise/context/index.js +0 -57
- package/cjs/components/material-exercise/exercise-code-history/index.js +0 -7
- package/cjs/components/material-exercise/exercise-code-history/locales/index.js +0 -13
- package/cjs/components/material-exercise/exercise-file/index.js +0 -7
- package/cjs/components/material-exercise/exercise-file-editor/index.js +0 -7
- package/cjs/components/material-exercise/exercise-file-editor/locales/index.js +0 -13
- package/cjs/components/material-exercise/exercise-file-tabs/exercise-file-tabs-file-tree-button/index.js +0 -7
- package/cjs/components/material-exercise/exercise-file-tabs/exercise-file-tabs-file-tree-button/locales/index.js +0 -13
- package/cjs/components/material-exercise/exercise-file-tabs/index.js +0 -9
- package/cjs/components/material-exercise/exercise-file-tabs/locales/index.js +0 -13
- package/cjs/components/material-exercise/exercise-file-tree/index.js +0 -9
- package/cjs/components/material-exercise/exercise-file-tree/locales/index.js +0 -13
- package/cjs/components/material-exercise/exercise-file-viewer/index.js +0 -7
- package/cjs/components/material-exercise/exercise-menu/index.js +0 -7
- package/cjs/components/material-exercise/exercise-menu/locales/index.js +0 -13
- package/cjs/components/material-exercise/exercise-multilang-dropdown/index.js +0 -9
- package/cjs/components/material-exercise/exercise-preview/index.js +0 -7
- package/cjs/components/material-exercise/exercise-preview/locales/index.js +0 -13
- package/cjs/components/material-exercise/exercise-rightpane/index.js +0 -7
- package/cjs/components/material-exercise/exercise-rightpane/locales/index.js +0 -13
- package/cjs/components/material-exercise/exercise-room/helpers/index.js +0 -7
- package/cjs/components/material-exercise/exercise-room/index.js +0 -7
- package/cjs/components/material-exercise/exercise-room/locales/index.js +0 -13
- package/cjs/components/material-exercise/exercise-runner/index.js +0 -7
- package/cjs/components/material-exercise/exercise-runner/locales/index.js +0 -13
- package/cjs/components/material-exercise/exercise-submit-history/index.js +0 -7
- package/cjs/components/material-exercise/exercise-submit-history/locales/index.js +0 -13
- package/cjs/components/material-exercise/index.js +0 -9
- package/cjs/components/shared/exercise-menu-button/index.js +0 -7
- package/cjs/components/shared/exercise-shimmer/index.js +0 -15
- package/cjs/components/shared/exercise-version-list/index.js +0 -9
- package/cjs/components/shared/file-icon/index.js +0 -7
- package/cjs/components/shared/file-tabs/index.js +0 -7
- package/cjs/components/shared/file-tree/context/index.js +0 -9
- package/cjs/components/shared/file-tree/file-tree-toolbar/index.js +0 -7
- package/cjs/components/shared/file-tree/file-tree-toolbar/locales/index.js +0 -13
- package/cjs/components/shared/file-tree/index.js +0 -7
- package/cjs/components/shared/file-tree/locales/index.js +0 -13
- package/cjs/components/shared/file-tree/utils/index.js +0 -20
- package/cjs/components/shared/file-viewer/index.js +0 -7
- package/cjs/components/shared/file-viewer/locales/index.js +0 -21
- package/cjs/components/shared/material-modal/index.js +0 -7
- package/cjs/components/shared/monaco-editor/constants/index.js +0 -13
- package/cjs/components/shared/monaco-editor/constants/monaco/index.js +0 -11
- package/cjs/components/shared/monaco-editor/editor-hooks/index.js +0 -17
- package/cjs/components/shared/monaco-editor/editor-languages/typescript/dts/index.js +0 -11
- package/cjs/components/shared/monaco-editor/hooks/index.js +0 -7
- package/cjs/components/shared/monaco-editor/index.js +0 -21
- package/cjs/components/shared/monaco-editor/locales/index.js +0 -13
- package/cjs/components/shared/monaco-editor/utils/emmet/index.js +0 -9
- package/cjs/components/shared/monaco-editor/utils/index.js +0 -9
- package/cjs/components/shared/monaco-editor/vendors/monaco-collab-ext/index.js +0 -12
- package/cjs/components/shared/monaco-editor/vendors/vscode-emmet-helper/index.js +0 -11
- package/cjs/components/shared/no-vnc/index.js +0 -7
- package/cjs/components/shared/preview-container/index.js +0 -9
- package/cjs/components/shared/web-browser/index.js +0 -7
- package/cjs/components/shared/xterm/index.js +0 -7
- package/cjs/components/shared/xterm/locales/index.js +0 -13
- package/cjs/constants/index.js +0 -7
- package/cjs/hooks/index.js +0 -20
- package/cjs/utils/index.js +0 -10
- package/es/_virtual/_rollupPluginBabelHelpers.js +0 -499
- package/es/components/index.js +0 -8
- package/es/components/locales/index.js +0 -4
- package/es/components/material-exercise/context/index.js +0 -5
- package/es/components/material-exercise/exercise-code-history/index.js +0 -1
- package/es/components/material-exercise/exercise-code-history/locales/index.js +0 -4
- package/es/components/material-exercise/exercise-file/index.js +0 -1
- package/es/components/material-exercise/exercise-file-editor/index.js +0 -1
- package/es/components/material-exercise/exercise-file-editor/locales/index.js +0 -4
- package/es/components/material-exercise/exercise-file-tabs/exercise-file-tabs-file-tree-button/index.js +0 -1
- package/es/components/material-exercise/exercise-file-tabs/exercise-file-tabs-file-tree-button/locales/index.js +0 -4
- package/es/components/material-exercise/exercise-file-tabs/index.js +0 -2
- package/es/components/material-exercise/exercise-file-tabs/locales/index.js +0 -4
- package/es/components/material-exercise/exercise-file-tree/index.js +0 -2
- package/es/components/material-exercise/exercise-file-tree/locales/index.js +0 -4
- package/es/components/material-exercise/exercise-file-viewer/index.js +0 -1
- package/es/components/material-exercise/exercise-menu/index.js +0 -1
- package/es/components/material-exercise/exercise-menu/locales/index.js +0 -4
- package/es/components/material-exercise/exercise-multilang-dropdown/index.js +0 -2
- package/es/components/material-exercise/exercise-preview/index.js +0 -1
- package/es/components/material-exercise/exercise-preview/locales/index.js +0 -4
- package/es/components/material-exercise/exercise-rightpane/index.js +0 -1
- package/es/components/material-exercise/exercise-rightpane/locales/index.js +0 -4
- package/es/components/material-exercise/exercise-room/helpers/index.js +0 -1
- package/es/components/material-exercise/exercise-room/index.js +0 -1
- package/es/components/material-exercise/exercise-room/locales/index.js +0 -4
- package/es/components/material-exercise/exercise-runner/index.js +0 -1
- package/es/components/material-exercise/exercise-runner/locales/index.js +0 -4
- package/es/components/material-exercise/exercise-submit-history/index.js +0 -1
- package/es/components/material-exercise/exercise-submit-history/locales/index.js +0 -4
- package/es/components/material-exercise/index.js +0 -2
- package/es/components/shared/exercise-menu-button/index.js +0 -1
- package/es/components/shared/exercise-shimmer/index.js +0 -5
- package/es/components/shared/exercise-version-list/index.js +0 -2
- package/es/components/shared/file-icon/index.js +0 -1
- package/es/components/shared/file-tabs/index.js +0 -1
- package/es/components/shared/file-tree/context/index.js +0 -1
- package/es/components/shared/file-tree/file-tree-toolbar/index.js +0 -1
- package/es/components/shared/file-tree/file-tree-toolbar/locales/index.js +0 -4
- package/es/components/shared/file-tree/index.js +0 -1
- package/es/components/shared/file-tree/locales/index.js +0 -4
- package/es/components/shared/file-tree/utils/index.js +0 -5
- package/es/components/shared/file-viewer/index.js +0 -1
- package/es/components/shared/file-viewer/locales/index.js +0 -8
- package/es/components/shared/material-modal/index.js +0 -1
- package/es/components/shared/monaco-editor/constants/index.js +0 -2
- package/es/components/shared/monaco-editor/constants/monaco/index.js +0 -1
- package/es/components/shared/monaco-editor/editor-hooks/index.js +0 -6
- package/es/components/shared/monaco-editor/editor-languages/typescript/dts/index.js +0 -3
- package/es/components/shared/monaco-editor/hooks/index.js +0 -1
- package/es/components/shared/monaco-editor/index.js +0 -6
- package/es/components/shared/monaco-editor/locales/index.js +0 -4
- package/es/components/shared/monaco-editor/utils/emmet/index.js +0 -1
- package/es/components/shared/monaco-editor/utils/index.js +0 -2
- package/es/components/shared/monaco-editor/vendors/monaco-collab-ext/index.js +0 -3
- package/es/components/shared/monaco-editor/vendors/vscode-emmet-helper/index.js +0 -2
- package/es/components/shared/no-vnc/index.js +0 -1
- package/es/components/shared/preview-container/index.js +0 -1
- package/es/components/shared/web-browser/index.js +0 -1
- package/es/components/shared/xterm/index.js +0 -1
- package/es/components/shared/xterm/locales/index.js +0 -4
- package/es/constants/index.js +0 -1
- package/es/hooks/index.js +0 -7
- package/es/utils/index.js +0 -2
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var _rollupPluginBabelHelpers = require('../_virtual/_rollupPluginBabelHelpers.js');
|
|
4
3
|
var React = require('react');
|
|
5
4
|
var reactUse = require('react-use');
|
|
6
5
|
var apiClient = require('@elice/api-client');
|
|
@@ -12,108 +11,77 @@ var otTextUnicode = require('ot-text-unicode');
|
|
|
12
11
|
var randomWords = require('random-words');
|
|
13
12
|
var unicount = require('unicount');
|
|
14
13
|
|
|
15
|
-
function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
|
|
16
|
-
|
|
17
|
-
var debounce__default = /*#__PURE__*/_interopDefaultCompat(debounce);
|
|
18
|
-
var randomWords__default = /*#__PURE__*/_interopDefaultCompat(randomWords);
|
|
19
|
-
|
|
20
14
|
//
|
|
21
15
|
//
|
|
22
16
|
//
|
|
23
|
-
|
|
17
|
+
const MAX_WRITE_FAIL_COUNT = 5;
|
|
24
18
|
/**
|
|
25
19
|
*
|
|
26
20
|
*/
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
clients = _useState8[0],
|
|
53
|
-
setClients = _useState8[1];
|
|
54
|
-
var _useState9 = React.useState({}),
|
|
55
|
-
_useState10 = _rollupPluginBabelHelpers.slicedToArray(_useState9, 2),
|
|
56
|
-
cursors = _useState10[0],
|
|
57
|
-
setCursors = _useState10[1];
|
|
58
|
-
var myself = React.useRef(null);
|
|
59
|
-
var version = React.useRef(-1);
|
|
60
|
-
var otsBuffer = React.useRef([]);
|
|
61
|
-
var writeIndex = React.useRef(0);
|
|
62
|
-
var writeFailCount = React.useRef(0);
|
|
63
|
-
var _useState11 = React.useState(0),
|
|
64
|
-
_useState12 = _rollupPluginBabelHelpers.slicedToArray(_useState11, 2),
|
|
65
|
-
_monkeyAgent = _useState12[0],
|
|
66
|
-
_setMonkeyAgent = _useState12[1];
|
|
67
|
-
var _useState13 = React.useState(0),
|
|
68
|
-
_useState14 = _rollupPluginBabelHelpers.slicedToArray(_useState13, 2),
|
|
69
|
-
_numMonkeyJumped = _useState14[0],
|
|
70
|
-
setNumMonkeyJumped = _useState14[1];
|
|
21
|
+
const useUsercodeEditWebSocket = ({
|
|
22
|
+
exerciseRoomId,
|
|
23
|
+
filename,
|
|
24
|
+
onInit,
|
|
25
|
+
onWriteNoti
|
|
26
|
+
}) => {
|
|
27
|
+
const _return = React.useRef({});
|
|
28
|
+
const {
|
|
29
|
+
apiWsOriginUrl
|
|
30
|
+
} = materialSharedUtils.useMaterialConfig();
|
|
31
|
+
const isReady = materialSharedUtils.useMaterialConfigApiClientUpdate(apiClient.config.init);
|
|
32
|
+
const websocket$1 = React.useRef(null);
|
|
33
|
+
const [websocketReadyState, setWebSocketReadyState] = React.useState(websocket.EliceWebSocket.CLOSED);
|
|
34
|
+
const [doc, setDoc] = React.useState('');
|
|
35
|
+
const [docEditable, setDocEditable] = React.useState(true);
|
|
36
|
+
const _doc = React.useRef('');
|
|
37
|
+
const [clients, setClients] = React.useState({});
|
|
38
|
+
const [cursors, setCursors] = React.useState({});
|
|
39
|
+
const myself = React.useRef(null);
|
|
40
|
+
const version = React.useRef(-1);
|
|
41
|
+
const otsBuffer = React.useRef([]);
|
|
42
|
+
const writeIndex = React.useRef(0);
|
|
43
|
+
const writeFailCount = React.useRef(0);
|
|
44
|
+
const [_monkeyAgent, _setMonkeyAgent] = React.useState(0);
|
|
45
|
+
const [_numMonkeyJumped, setNumMonkeyJumped] = React.useState(0);
|
|
71
46
|
//
|
|
72
47
|
// =============== clients and markers ===============
|
|
73
48
|
//
|
|
74
49
|
/**
|
|
75
50
|
* Markers.
|
|
76
51
|
*/
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
}).map(function (_ref4) {
|
|
83
|
-
var _ref5 = _rollupPluginBabelHelpers.slicedToArray(_ref4, 2),
|
|
84
|
-
userAccesskey = _ref5[0],
|
|
85
|
-
cursor = _ref5[1];
|
|
86
|
-
var client = clients[userAccesskey];
|
|
87
|
-
return Object.assign(Object.assign(Object.assign({}, client), cursor), {
|
|
88
|
-
fullname: client.fullname || "User ".concat(client.id),
|
|
89
|
-
email: client.email || 'none'
|
|
90
|
-
});
|
|
52
|
+
const markers = React.useMemo(() => Object.entries(cursors).filter(([userAccesskey]) => Boolean(clients[userAccesskey])).map(([userAccesskey, cursor]) => {
|
|
53
|
+
const client = clients[userAccesskey];
|
|
54
|
+
return Object.assign(Object.assign(Object.assign({}, client), cursor), {
|
|
55
|
+
fullname: client.fullname || `User ${client.id}`,
|
|
56
|
+
email: client.email || 'none'
|
|
91
57
|
});
|
|
92
|
-
}, [clients, cursors]);
|
|
58
|
+
}), [clients, cursors]);
|
|
93
59
|
/**
|
|
94
60
|
* Update client to list.
|
|
95
61
|
*/
|
|
96
|
-
|
|
62
|
+
const updateClient = (userAccesskey, userId) => {
|
|
97
63
|
var _a;
|
|
98
64
|
if (userAccesskey === ((_a = myself.current) === null || _a === void 0 ? void 0 : _a.accesskey)) {
|
|
99
65
|
return;
|
|
100
66
|
}
|
|
101
|
-
setClients(
|
|
67
|
+
setClients(prev => {
|
|
102
68
|
if (prev[userAccesskey]) {
|
|
103
69
|
return prev;
|
|
104
70
|
}
|
|
105
|
-
return Object.assign(Object.assign({}, prev),
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
71
|
+
return Object.assign(Object.assign({}, prev), {
|
|
72
|
+
[userAccesskey]: {
|
|
73
|
+
id: userId,
|
|
74
|
+
accesskey: userAccesskey
|
|
75
|
+
}
|
|
76
|
+
});
|
|
109
77
|
});
|
|
110
78
|
};
|
|
111
79
|
/**
|
|
112
80
|
* Remove client from list.
|
|
113
81
|
*/
|
|
114
|
-
|
|
115
|
-
setClients(
|
|
116
|
-
|
|
82
|
+
const removeClient = userAccesskey => {
|
|
83
|
+
setClients(prev => {
|
|
84
|
+
const next = Object.assign({}, prev);
|
|
117
85
|
delete next[userAccesskey];
|
|
118
86
|
return next;
|
|
119
87
|
});
|
|
@@ -121,37 +89,32 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
121
89
|
/**
|
|
122
90
|
*
|
|
123
91
|
*/
|
|
124
|
-
|
|
92
|
+
const updateCursor = (userAccesskey, cursor) => {
|
|
125
93
|
var _a;
|
|
126
94
|
if (userAccesskey === ((_a = myself.current) === null || _a === void 0 ? void 0 : _a.accesskey)) {
|
|
127
95
|
return;
|
|
128
96
|
}
|
|
129
|
-
setCursors(
|
|
130
|
-
|
|
131
|
-
});
|
|
97
|
+
setCursors(prev => Object.assign(Object.assign({}, prev), {
|
|
98
|
+
[userAccesskey]: cursor
|
|
99
|
+
}));
|
|
132
100
|
};
|
|
133
101
|
/**
|
|
134
102
|
*
|
|
135
103
|
*/
|
|
136
|
-
|
|
137
|
-
setCursors(Object.entries(cursors).map(
|
|
138
|
-
|
|
139
|
-
userAccesskey = _ref7[0],
|
|
140
|
-
cursor = _ref7[1];
|
|
141
|
-
return _rollupPluginBabelHelpers.defineProperty({}, userAccesskey, {
|
|
104
|
+
const updateCursorFromOts = ots => {
|
|
105
|
+
setCursors(Object.entries(cursors).map(([userAccesskey, cursor]) => ({
|
|
106
|
+
[userAccesskey]: {
|
|
142
107
|
from: otTextUnicode.type.transformSelection(cursor.from, ots),
|
|
143
108
|
to: otTextUnicode.type.transformSelection(cursor.to, ots)
|
|
144
|
-
}
|
|
145
|
-
}).reduce(
|
|
146
|
-
return Object.assign(Object.assign({}, prev), next);
|
|
147
|
-
}, {}));
|
|
109
|
+
}
|
|
110
|
+
})).reduce((prev, next) => Object.assign(Object.assign({}, prev), next), {}));
|
|
148
111
|
};
|
|
149
112
|
/**
|
|
150
113
|
*
|
|
151
114
|
*/
|
|
152
|
-
|
|
153
|
-
setCursors(
|
|
154
|
-
|
|
115
|
+
const removeCursor = userAccesskey => {
|
|
116
|
+
setCursors(prev => {
|
|
117
|
+
const next = Object.assign({}, prev);
|
|
155
118
|
delete next[userAccesskey];
|
|
156
119
|
return next;
|
|
157
120
|
});
|
|
@@ -159,39 +122,22 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
159
122
|
//
|
|
160
123
|
// Fetch client user info, whenever client list changed.
|
|
161
124
|
//
|
|
162
|
-
reactUse.useDeepCompareEffect(
|
|
125
|
+
reactUse.useDeepCompareEffect(() => {
|
|
163
126
|
void Promise.all(Object.entries(Object.assign({}, clients))
|
|
164
127
|
// only user info not fetched...
|
|
165
|
-
.filter(
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
})
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
return _rollupPluginBabelHelpers.defineProperty({}, userAccesskey, Object.assign(Object.assign({}, client), {
|
|
179
|
-
fullname: user.fullname,
|
|
180
|
-
email: user.displayEmail
|
|
181
|
-
}));
|
|
182
|
-
}).catch(function () {
|
|
183
|
-
return _rollupPluginBabelHelpers.defineProperty({}, userAccesskey, Object.assign(Object.assign({}, client), {
|
|
184
|
-
fullname: "User ".concat(client.id)
|
|
185
|
-
}));
|
|
186
|
-
});
|
|
187
|
-
})).then(function (nextClientArr) {
|
|
188
|
-
return nextClientArr.reduce(function (nextClients, client) {
|
|
189
|
-
return Object.assign(Object.assign({}, nextClients), client);
|
|
190
|
-
}, {});
|
|
191
|
-
}).then(function (nextClients) {
|
|
192
|
-
setClients(function (prev) {
|
|
193
|
-
return Object.assign(Object.assign({}, prev), nextClients);
|
|
194
|
-
});
|
|
128
|
+
.filter(([, client]) => !client.fullname).map(([userAccesskey, client]) => apiClient.getOrgUserGet({
|
|
129
|
+
userId: client.id
|
|
130
|
+
}).then(res => res.user).then(user => ({
|
|
131
|
+
[userAccesskey]: Object.assign(Object.assign({}, client), {
|
|
132
|
+
fullname: user.fullname,
|
|
133
|
+
email: user.displayEmail
|
|
134
|
+
})
|
|
135
|
+
})).catch(() => ({
|
|
136
|
+
[userAccesskey]: Object.assign(Object.assign({}, client), {
|
|
137
|
+
fullname: `User ${client.id}`
|
|
138
|
+
})
|
|
139
|
+
})))).then(nextClientArr => nextClientArr.reduce((nextClients, client) => Object.assign(Object.assign({}, nextClients), client), {})).then(nextClients => {
|
|
140
|
+
setClients(prev => Object.assign(Object.assign({}, prev), nextClients));
|
|
195
141
|
});
|
|
196
142
|
}, [clients]);
|
|
197
143
|
//
|
|
@@ -200,7 +146,7 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
200
146
|
/**
|
|
201
147
|
* Send `RESET`.
|
|
202
148
|
*/
|
|
203
|
-
|
|
149
|
+
const sendReset = () => {
|
|
204
150
|
var _a;
|
|
205
151
|
(_a = websocket$1.current) === null || _a === void 0 ? void 0 : _a.sendJson({
|
|
206
152
|
type: 'RESET'
|
|
@@ -209,55 +155,50 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
209
155
|
/**
|
|
210
156
|
* Send `FETCH`.
|
|
211
157
|
*/
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
}, 1000);
|
|
220
|
-
}, []);
|
|
158
|
+
const sendFetch = React.useMemo(() => debounce(() => {
|
|
159
|
+
var _a;
|
|
160
|
+
(_a = websocket$1.current) === null || _a === void 0 ? void 0 : _a.sendJson({
|
|
161
|
+
type: 'FETCH',
|
|
162
|
+
from: version.current
|
|
163
|
+
});
|
|
164
|
+
}, 1000), []);
|
|
221
165
|
/**
|
|
222
166
|
* Send `WRITE`.
|
|
223
167
|
*/
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
}, 100);
|
|
241
|
-
}, []);
|
|
168
|
+
const sendWrite = React.useMemo(() => debounce(() => {
|
|
169
|
+
var _a;
|
|
170
|
+
if (otsBuffer.current.length === 0 || writeIndex.current !== 0) {
|
|
171
|
+
return;
|
|
172
|
+
}
|
|
173
|
+
writeIndex.current = otsBuffer.current.length;
|
|
174
|
+
let ots = otsBuffer.current[0];
|
|
175
|
+
for (let i = 1; i < writeIndex.current; i++) {
|
|
176
|
+
ots = otTextUnicode.type.compose(ots, otsBuffer.current[i]);
|
|
177
|
+
}
|
|
178
|
+
(_a = websocket$1.current) === null || _a === void 0 ? void 0 : _a.sendJson({
|
|
179
|
+
type: 'WRITE',
|
|
180
|
+
to: version.current + 1,
|
|
181
|
+
ots: ots
|
|
182
|
+
});
|
|
183
|
+
}, 100), []);
|
|
242
184
|
/**
|
|
243
185
|
* Send `CURSOR`.
|
|
244
186
|
*/
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
}, []);
|
|
187
|
+
const sendCursor = React.useMemo(() => debounce(({
|
|
188
|
+
from,
|
|
189
|
+
to
|
|
190
|
+
}) => {
|
|
191
|
+
var _a;
|
|
192
|
+
(_a = websocket$1.current) === null || _a === void 0 ? void 0 : _a.sendJson({
|
|
193
|
+
type: 'CURSOR',
|
|
194
|
+
cursor_start: from,
|
|
195
|
+
cursor_end: to
|
|
196
|
+
});
|
|
197
|
+
}, 500), []);
|
|
257
198
|
/**
|
|
258
199
|
* Send OTs.
|
|
259
200
|
*/
|
|
260
|
-
|
|
201
|
+
const sendOTs = React.useCallback(ots => {
|
|
261
202
|
setDoc(otTextUnicode.type.apply(_doc.current, ots));
|
|
262
203
|
_doc.current = otTextUnicode.type.apply(_doc.current, ots);
|
|
263
204
|
otsBuffer.current.push(ots);
|
|
@@ -269,20 +210,20 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
269
210
|
/**
|
|
270
211
|
*
|
|
271
212
|
*/
|
|
272
|
-
|
|
213
|
+
const usercodeApply = (newVersion, ots) => {
|
|
273
214
|
version.current = newVersion;
|
|
274
|
-
|
|
275
|
-
for (
|
|
215
|
+
let conflictOts = [];
|
|
216
|
+
for (let i = 0; i < otsBuffer.current.length; i++) {
|
|
276
217
|
conflictOts = otTextUnicode.type.compose(conflictOts, otsBuffer.current[i]);
|
|
277
218
|
}
|
|
278
|
-
|
|
219
|
+
const localOts = conflictOts.length > 0 ? otTextUnicode.type.transform(ots, conflictOts, 'left') : ots;
|
|
279
220
|
onWriteNoti(localOts, false);
|
|
280
221
|
setDoc(otTextUnicode.type.apply(_doc.current, localOts));
|
|
281
222
|
_doc.current = otTextUnicode.type.apply(_doc.current, localOts);
|
|
282
223
|
if (conflictOts.length > 0) {
|
|
283
224
|
// update ots buffer
|
|
284
|
-
for (
|
|
285
|
-
otsBuffer.current[
|
|
225
|
+
for (let i = 0; i < otsBuffer.current.length - 1; i++) {
|
|
226
|
+
otsBuffer.current[i] = [];
|
|
286
227
|
}
|
|
287
228
|
otsBuffer.current[otsBuffer.current.length - 1] = otTextUnicode.type.transform(conflictOts, ots, 'right');
|
|
288
229
|
}
|
|
@@ -296,7 +237,7 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
296
237
|
/**
|
|
297
238
|
* Websocket on open.
|
|
298
239
|
*/
|
|
299
|
-
|
|
240
|
+
const wsOpen = () => {
|
|
300
241
|
if (websocket$1.current) {
|
|
301
242
|
setWebSocketReadyState(websocket$1.current.readyState);
|
|
302
243
|
}
|
|
@@ -304,7 +245,7 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
304
245
|
/**
|
|
305
246
|
* Websocket on close.
|
|
306
247
|
*/
|
|
307
|
-
|
|
248
|
+
const wsClose = () => {
|
|
308
249
|
_stopMonkey();
|
|
309
250
|
if (websocket$1.current) {
|
|
310
251
|
setWebSocketReadyState(websocket$1.current.readyState);
|
|
@@ -313,7 +254,7 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
313
254
|
/**
|
|
314
255
|
* Websocket on error.
|
|
315
256
|
*/
|
|
316
|
-
|
|
257
|
+
const wsError = () => {
|
|
317
258
|
if (websocket$1.current) {
|
|
318
259
|
setWebSocketReadyState(websocket$1.current.readyState);
|
|
319
260
|
}
|
|
@@ -321,8 +262,8 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
321
262
|
/**
|
|
322
263
|
* Websocket on message.
|
|
323
264
|
*/
|
|
324
|
-
|
|
325
|
-
|
|
265
|
+
const wsMessage = e => {
|
|
266
|
+
const msg = humps.camelizeKeys(e.data);
|
|
326
267
|
switch (msg.type) {
|
|
327
268
|
case 'INIT':
|
|
328
269
|
wsMessageInit(msg);
|
|
@@ -353,7 +294,7 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
353
294
|
/**
|
|
354
295
|
* Websocket on `INIT` message.
|
|
355
296
|
*/
|
|
356
|
-
|
|
297
|
+
const wsMessageInit = msg => {
|
|
357
298
|
setDocEditable(true);
|
|
358
299
|
myself.current = {
|
|
359
300
|
userId: msg.userId,
|
|
@@ -365,7 +306,7 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
365
306
|
writeFailCount.current = 0;
|
|
366
307
|
// TODO: set unix mode on both editors.
|
|
367
308
|
// editor.getSession().getDocument().setNewLineMode('unix');
|
|
368
|
-
|
|
309
|
+
const convertedContent = msg.content.replace(/\r\n/g, '\n');
|
|
369
310
|
setDoc(convertedContent);
|
|
370
311
|
_doc.current = convertedContent;
|
|
371
312
|
onInit(convertedContent);
|
|
@@ -380,25 +321,22 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
380
321
|
/**
|
|
381
322
|
* Websocket on `ENTER` message.
|
|
382
323
|
*/
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
userId = _msg$client[0],
|
|
386
|
-
userAccesskey = _msg$client[1];
|
|
324
|
+
const wsMessageEnter = msg => {
|
|
325
|
+
const [userId, userAccesskey] = msg.client;
|
|
387
326
|
updateClient(userAccesskey, userId);
|
|
388
327
|
};
|
|
389
328
|
/**
|
|
390
329
|
* Websocket on `LEAVE` message.
|
|
391
330
|
*/
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
userAccesskey = _msg$client2[1];
|
|
331
|
+
const wsMessageLeave = msg => {
|
|
332
|
+
const [, userAccesskey] = msg.client;
|
|
395
333
|
removeClient(userAccesskey);
|
|
396
334
|
removeCursor(userAccesskey);
|
|
397
335
|
};
|
|
398
336
|
/**
|
|
399
337
|
* Websocket on `UPDATE` message.
|
|
400
338
|
*/
|
|
401
|
-
|
|
339
|
+
const wsMessageUpdate = msg => {
|
|
402
340
|
if (msg.from === version.current) {
|
|
403
341
|
usercodeApply(msg.version, msg.ots);
|
|
404
342
|
} else if (msg.from < version.current) {
|
|
@@ -408,7 +346,7 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
408
346
|
/**
|
|
409
347
|
* Websocket on `WRITE_FAILED` message.
|
|
410
348
|
*/
|
|
411
|
-
|
|
349
|
+
const wsMessageWriteFailed = msg => {
|
|
412
350
|
writeIndex.current = 0;
|
|
413
351
|
writeFailCount.current += 1;
|
|
414
352
|
if (MAX_WRITE_FAIL_COUNT < writeFailCount.current) {
|
|
@@ -420,7 +358,7 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
420
358
|
/**
|
|
421
359
|
* Websocket on `WRITE_SUCCEED` message.
|
|
422
360
|
*/
|
|
423
|
-
|
|
361
|
+
const wsMessageWriteSucceed = msg => {
|
|
424
362
|
version.current = msg.version;
|
|
425
363
|
otsBuffer.current.splice(0, writeIndex.current);
|
|
426
364
|
writeIndex.current = 0;
|
|
@@ -430,7 +368,7 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
430
368
|
/**
|
|
431
369
|
* Websocket on `WRITE_NOTI` message.
|
|
432
370
|
*/
|
|
433
|
-
|
|
371
|
+
const wsMessageWriteNoti = msg => {
|
|
434
372
|
if (version.current + 1 === msg.version) {
|
|
435
373
|
usercodeApply(msg.version, msg.ots);
|
|
436
374
|
} else if (version.current < msg.version) {
|
|
@@ -440,10 +378,8 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
440
378
|
/**
|
|
441
379
|
* Websocket on `CURSOR_NOTI` message.
|
|
442
380
|
*/
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
userId = _msg$client3[0],
|
|
446
|
-
userAccesskey = _msg$client3[1];
|
|
381
|
+
const wsMessageCursorNoti = msg => {
|
|
382
|
+
const [userId, userAccesskey] = msg.client;
|
|
447
383
|
updateClient(userAccesskey, userId);
|
|
448
384
|
updateCursor(userAccesskey, {
|
|
449
385
|
from: msg.cursorStart,
|
|
@@ -453,40 +389,26 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
453
389
|
/**
|
|
454
390
|
* Create usercode websocket url.
|
|
455
391
|
*/
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
return _context.abrupt("return", apiClient.postOrgMaterialExerciseUsercodeEdit({
|
|
469
|
-
exerciseRoomId: exerciseRoomId,
|
|
470
|
-
filename: filename
|
|
471
|
-
}).then(function (data) {
|
|
472
|
-
return "".concat(url, "/").concat(data.accesskey);
|
|
473
|
-
}).catch(function (err) {
|
|
474
|
-
var _a, _b;
|
|
475
|
-
if (((_a = err.detail) === null || _a === void 0 ? void 0 : _a.failCode) === 'non_editable_file') {
|
|
476
|
-
setDocEditable(false);
|
|
477
|
-
}
|
|
478
|
-
throw new Error(((_b = err.detail) === null || _b === void 0 ? void 0 : _b.failMessage) || err.message);
|
|
479
|
-
}));
|
|
480
|
-
case 4:
|
|
481
|
-
case "end":
|
|
482
|
-
return _context.stop();
|
|
392
|
+
const createUsercodeUrl = React.useCallback(async () => {
|
|
393
|
+
if (!filename) {
|
|
394
|
+
throw new Error('filename is not defined');
|
|
395
|
+
}
|
|
396
|
+
const url = `${apiWsOriginUrl}/usercode_edit`;
|
|
397
|
+
return apiClient.postOrgMaterialExerciseUsercodeEdit({
|
|
398
|
+
exerciseRoomId,
|
|
399
|
+
filename
|
|
400
|
+
}).then(data => `${url}/${data.accesskey}`).catch(err => {
|
|
401
|
+
var _a, _b;
|
|
402
|
+
if (((_a = err.detail) === null || _a === void 0 ? void 0 : _a.failCode) === 'non_editable_file') {
|
|
403
|
+
setDocEditable(false);
|
|
483
404
|
}
|
|
484
|
-
|
|
485
|
-
|
|
405
|
+
throw new Error(((_b = err.detail) === null || _b === void 0 ? void 0 : _b.failMessage) || err.message);
|
|
406
|
+
});
|
|
407
|
+
}, [apiWsOriginUrl, exerciseRoomId, filename]);
|
|
486
408
|
//
|
|
487
409
|
// Initialize websocket.
|
|
488
410
|
//
|
|
489
|
-
React.useEffect(
|
|
411
|
+
React.useEffect(() => {
|
|
490
412
|
if (!isReady) {
|
|
491
413
|
return;
|
|
492
414
|
}
|
|
@@ -495,7 +417,7 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
495
417
|
websocket$1.current.onclose = wsClose;
|
|
496
418
|
websocket$1.current.onmessage = wsMessage;
|
|
497
419
|
websocket$1.current.onerror = wsError;
|
|
498
|
-
return
|
|
420
|
+
return () => {
|
|
499
421
|
if (websocket$1.current) {
|
|
500
422
|
websocket$1.current.close();
|
|
501
423
|
}
|
|
@@ -510,24 +432,24 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
510
432
|
* Make monkey jump.
|
|
511
433
|
* @note only for testing
|
|
512
434
|
*/
|
|
513
|
-
|
|
514
|
-
|
|
435
|
+
const _monkeyAgentDoJump = React.useCallback(() => {
|
|
436
|
+
const getRandomInt = function (max) {
|
|
515
437
|
return Math.floor(Math.random() * max);
|
|
516
438
|
};
|
|
517
|
-
|
|
518
|
-
|
|
439
|
+
const emojis = ['๐ฆ', '๐', '๐', '๐', '๐ต', '๐', '๐ฆน๐ผ', '๐ง๐พ', '๐จโ๐งโ๐ฆ'];
|
|
440
|
+
const getRandomEmoji = () => {
|
|
519
441
|
return emojis[getRandomInt(emojis.length)];
|
|
520
442
|
};
|
|
521
|
-
|
|
522
|
-
|
|
443
|
+
const uniTextLength = unicount.uniCount(_doc.current);
|
|
444
|
+
const uniPos = Math.floor(Math.random() * uniTextLength);
|
|
523
445
|
// add text
|
|
524
446
|
if (Math.random() < 0.5) {
|
|
525
|
-
|
|
526
|
-
|
|
447
|
+
const randomNumber = Math.random();
|
|
448
|
+
let text = '';
|
|
527
449
|
if (randomNumber < 1 / 3) {
|
|
528
450
|
text = getRandomEmoji();
|
|
529
451
|
} else if (randomNumber < 2 / 3) {
|
|
530
|
-
text =
|
|
452
|
+
text = randomWords(2).join(' ');
|
|
531
453
|
} else {
|
|
532
454
|
text = '\n';
|
|
533
455
|
}
|
|
@@ -535,7 +457,7 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
535
457
|
}
|
|
536
458
|
// delete text
|
|
537
459
|
else {
|
|
538
|
-
|
|
460
|
+
let uniTextTo = uniPos + getRandomInt(10);
|
|
539
461
|
if (uniTextTo >= uniTextLength) {
|
|
540
462
|
uniTextTo = uniTextLength - 1;
|
|
541
463
|
}
|
|
@@ -543,9 +465,7 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
543
465
|
d: _doc.current.slice(unicount.uniToStrPos(_doc.current, uniPos), unicount.uniToStrPos(_doc.current, uniTextTo))
|
|
544
466
|
}], true);
|
|
545
467
|
}
|
|
546
|
-
setNumMonkeyJumped(
|
|
547
|
-
return mj + 1;
|
|
548
|
-
});
|
|
468
|
+
setNumMonkeyJumped(mj => mj + 1);
|
|
549
469
|
},
|
|
550
470
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
551
471
|
[]);
|
|
@@ -553,7 +473,7 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
553
473
|
* Make monkey jump.
|
|
554
474
|
* @note only for testing
|
|
555
475
|
*/
|
|
556
|
-
|
|
476
|
+
const _startMonkey = React.useCallback(() => {
|
|
557
477
|
setNumMonkeyJumped(0);
|
|
558
478
|
_setMonkeyAgent(window.setInterval(_monkeyAgentDoJump, 500));
|
|
559
479
|
},
|
|
@@ -563,7 +483,7 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
|
|
|
563
483
|
* Stop monkey jump.
|
|
564
484
|
* @note only for testing
|
|
565
485
|
*/
|
|
566
|
-
|
|
486
|
+
const _stopMonkey = React.useCallback(() => {
|
|
567
487
|
if (_monkeyAgent) {
|
|
568
488
|
window.clearInterval(_monkeyAgent);
|
|
569
489
|
_setMonkeyAgent(0);
|