Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
frontend
Commits
f56d412e
Commit
f56d412e
authored
Mar 20, 2023
by
tom
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
highlight selected file
parent
64b562bf
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
9 deletions
+22
-9
CodeEditor.tsx
ui/shared/monaco/CodeEditor.tsx
+1
-1
CodeEditorFileExplorer.tsx
ui/shared/monaco/CodeEditorFileExplorer.tsx
+3
-2
CodeEditorFileTree.tsx
ui/shared/monaco/CodeEditorFileTree.tsx
+11
-3
CodeEditorSideBar.tsx
ui/shared/monaco/CodeEditorSideBar.tsx
+3
-2
CodeEditorTab.tsx
ui/shared/monaco/CodeEditorTab.tsx
+1
-1
useColors.ts
ui/shared/monaco/utils/useColors.ts
+3
-0
No files found.
ui/shared/monaco/CodeEditor.tsx
View file @
f56d412e
...
@@ -98,7 +98,7 @@ const CodeEditor = ({ data }: Props) => {
...
@@ -98,7 +98,7 @@ const CodeEditor = ({ data }: Props) => {
onMount=
{
handleEditorDidMount
}
onMount=
{
handleEditorDidMount
}
/>
/>
</
Box
>
</
Box
>
<
CodeEditorSideBar
data=
{
data
}
onFileSelect=
{
handleSelectFile
}
monaco=
{
instance
}
/>
<
CodeEditorSideBar
data=
{
data
}
onFileSelect=
{
handleSelectFile
}
monaco=
{
instance
}
selectedFile=
{
data
[
index
].
file_path
}
/>
</
Flex
>
</
Flex
>
);
);
};
};
...
...
ui/shared/monaco/CodeEditorFileExplorer.tsx
View file @
f56d412e
...
@@ -10,9 +10,10 @@ import composeFileTree from './utils/composeFileTree';
...
@@ -10,9 +10,10 @@ import composeFileTree from './utils/composeFileTree';
interface
Props
{
interface
Props
{
data
:
Array
<
File
>
;
data
:
Array
<
File
>
;
onFileSelect
:
(
index
:
number
)
=>
void
;
onFileSelect
:
(
index
:
number
)
=>
void
;
selectedFile
:
string
;
}
}
const
CodeEditorFileExplorer
=
({
data
,
onFileSelect
}:
Props
)
=>
{
const
CodeEditorFileExplorer
=
({
data
,
onFileSelect
,
selectedFile
}:
Props
)
=>
{
const
[
key
,
setKey
]
=
React
.
useState
(
0
);
const
[
key
,
setKey
]
=
React
.
useState
(
0
);
const
tree
=
React
.
useMemo
(()
=>
{
const
tree
=
React
.
useMemo
(()
=>
{
return
composeFileTree
(
data
);
return
composeFileTree
(
data
);
...
@@ -34,7 +35,7 @@ const CodeEditorFileExplorer = ({ data, onFileSelect }: Props) => {
...
@@ -34,7 +35,7 @@ const CodeEditorFileExplorer = ({ data, onFileSelect }: Props) => {
return
(
return
(
<
Box
>
<
Box
>
<
CoderEditorCollapseButton
onClick=
{
handleCollapseButtonClick
}
label=
"Collapse folders"
/>
<
CoderEditorCollapseButton
onClick=
{
handleCollapseButtonClick
}
label=
"Collapse folders"
/>
<
CodeEditorFileTree
key=
{
key
}
tree=
{
tree
}
onItemClick=
{
handleFileClick
}
isCollapsed=
{
key
>
0
}
/>
<
CodeEditorFileTree
key=
{
key
}
tree=
{
tree
}
onItemClick=
{
handleFileClick
}
isCollapsed=
{
key
>
0
}
selectedFile=
{
selectedFile
}
/>
</
Box
>
</
Box
>
);
);
};
};
...
...
ui/shared/monaco/CodeEditorFileTree.tsx
View file @
f56d412e
...
@@ -15,9 +15,10 @@ interface Props {
...
@@ -15,9 +15,10 @@ interface Props {
level
?:
number
;
level
?:
number
;
isCollapsed
?:
boolean
;
isCollapsed
?:
boolean
;
onItemClick
:
(
event
:
React
.
MouseEvent
)
=>
void
;
onItemClick
:
(
event
:
React
.
MouseEvent
)
=>
void
;
selectedFile
:
string
;
}
}
const
CodeEditorFileTree
=
({
tree
,
level
=
0
,
onItemClick
,
isCollapsed
}:
Props
)
=>
{
const
CodeEditorFileTree
=
({
tree
,
level
=
0
,
onItemClick
,
isCollapsed
,
selectedFile
}:
Props
)
=>
{
const
itemProps
:
ChakraProps
=
{
const
itemProps
:
ChakraProps
=
{
borderWidth
:
'
0px
'
,
borderWidth
:
'
0px
'
,
cursor
:
'
pointer
'
,
cursor
:
'
pointer
'
,
...
@@ -55,7 +56,13 @@ const CodeEditorFileTree = ({ tree, level = 0, onItemClick, isCollapsed }: Props
...
@@ -55,7 +56,13 @@ const CodeEditorFileTree = ({ tree, level = 0, onItemClick, isCollapsed }: Props
{
leafName
}
{
leafName
}
</
AccordionButton
>
</
AccordionButton
>
<
AccordionPanel
p=
"0"
>
<
AccordionPanel
p=
"0"
>
<
CodeEditorFileTree
tree=
{
leaf
.
children
}
level=
{
level
+
1
}
onItemClick=
{
onItemClick
}
isCollapsed=
{
isCollapsed
}
/>
<
CodeEditorFileTree
tree=
{
leaf
.
children
}
level=
{
level
+
1
}
onItemClick=
{
onItemClick
}
isCollapsed=
{
isCollapsed
}
selectedFile=
{
selectedFile
}
/>
</
AccordionPanel
>
</
AccordionPanel
>
</>
</>
)
}
)
}
...
@@ -77,8 +84,9 @@ const CodeEditorFileTree = ({ tree, level = 0, onItemClick, isCollapsed }: Props
...
@@ -77,8 +84,9 @@ const CodeEditorFileTree = ({ tree, level = 0, onItemClick, isCollapsed }: Props
alignItems=
"center"
alignItems=
"center"
overflow=
"hidden"
overflow=
"hidden"
_hover=
{
{
_hover=
{
{
bgColor
:
rowHoverBgColor
,
bgColor
:
selectedFile
===
leaf
.
file_path
?
colors
.
selection
.
bgColorSelected
:
rowHoverBgColor
,
}
}
}
}
bgColor=
{
selectedFile
===
leaf
.
file_path
?
colors
.
selection
.
bgColorSelected
:
'
none
'
}
>
>
<
Icon
as=
{
icon
}
boxSize=
"16px"
mr=
"4px"
/>
<
Icon
as=
{
icon
}
boxSize=
"16px"
mr=
"4px"
/>
{
leafName
}
{
leafName
}
...
...
ui/shared/monaco/CodeEditorSideBar.tsx
View file @
f56d412e
...
@@ -13,9 +13,10 @@ interface Props {
...
@@ -13,9 +13,10 @@ interface Props {
monaco
:
Monaco
|
undefined
;
monaco
:
Monaco
|
undefined
;
data
:
Array
<
File
>
;
data
:
Array
<
File
>
;
onFileSelect
:
(
index
:
number
,
lineNumber
?:
number
)
=>
void
;
onFileSelect
:
(
index
:
number
,
lineNumber
?:
number
)
=>
void
;
selectedFile
:
string
;
}
}
const
CodeEditorSideBar
=
({
onFileSelect
,
data
,
monaco
}:
Props
)
=>
{
const
CodeEditorSideBar
=
({
onFileSelect
,
data
,
monaco
,
selectedFile
}:
Props
)
=>
{
const
[
isStuck
,
setIsStuck
]
=
React
.
useState
(
false
);
const
[
isStuck
,
setIsStuck
]
=
React
.
useState
(
false
);
...
@@ -59,7 +60,7 @@ const CodeEditorSideBar = ({ onFileSelect, data, monaco }: Props) => {
...
@@ -59,7 +60,7 @@ const CodeEditorSideBar = ({ onFileSelect, data, monaco }: Props) => {
<
TabPanels
>
<
TabPanels
>
<
TabPanel
p=
{
0
}
>
<
TabPanel
p=
{
0
}
>
<
CodeEditorFileExplorer
data=
{
data
}
onFileSelect=
{
onFileSelect
}
/>
<
CodeEditorFileExplorer
data=
{
data
}
onFileSelect=
{
onFileSelect
}
selectedFile=
{
selectedFile
}
/>
</
TabPanel
>
</
TabPanel
>
<
TabPanel
p=
{
0
}
>
<
TabPanel
p=
{
0
}
>
<
CodeEditorSearch
data=
{
data
}
onFileSelect=
{
onFileSelect
}
monaco=
{
monaco
}
isInputStuck=
{
isStuck
}
/>
<
CodeEditorSearch
data=
{
data
}
onFileSelect=
{
onFileSelect
}
monaco=
{
monaco
}
isInputStuck=
{
isStuck
}
/>
...
...
ui/shared/monaco/CodeEditorTab.tsx
View file @
f56d412e
...
@@ -50,7 +50,7 @@ const CodeEditorTab = ({ isActive, path, onClick, onClose, isCloseDisabled, tabs
...
@@ -50,7 +50,7 @@ const CodeEditorTab = ({ isActive, path, onClick, onClose, isCloseDisabled, tabs
borderBottomColor=
{
isActive
?
'
transparent
'
:
borderColorInactive
}
borderBottomColor=
{
isActive
?
'
transparent
'
:
borderColorInactive
}
color=
{
isActive
?
color
:
colorInactive
}
color=
{
isActive
?
color
:
colorInactive
}
alignItems=
"center"
alignItems=
"center"
fontWeight=
{
5
00
}
fontWeight=
{
4
00
}
cursor=
"pointer"
cursor=
"pointer"
onClick=
{
handleClick
}
onClick=
{
handleClick
}
_hover=
{
{
_hover=
{
{
...
...
ui/shared/monaco/utils/useColors.ts
View file @
f56d412e
...
@@ -9,5 +9,8 @@ export default function useColors() {
...
@@ -9,5 +9,8 @@ export default function useColors() {
bgColorHover
:
useColorModeValue
(
'
rgba(184, 184, 184, 0.31)
'
,
'
rgba(90, 93, 94, 0.31)
'
),
bgColorHover
:
useColorModeValue
(
'
rgba(184, 184, 184, 0.31)
'
,
'
rgba(90, 93, 94, 0.31)
'
),
color
:
'
#616161
'
,
color
:
'
#616161
'
,
},
},
selection
:
{
bgColorSelected
:
useColorModeValue
(
'
#e4e6f1
'
,
'
#37373d
'
),
},
};
};
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment