Skip to content

Commit 31c1a13

Browse files
authored
Merge pull request #246 from devtron-labs/feat/dynamic-code-editor-height
feat: add support for content based editor height
2 parents 937f5c1 + 4b84656 commit 31c1a13

File tree

4 files changed

+17
-7
lines changed

4 files changed

+17
-7
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "0.2.13",
3+
"version": "0.2.14",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Common/CodeEditor/CodeEditor.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
8787
cleanData = false,
8888
onBlur,
8989
onFocus,
90-
adjustEditorHeightToContent,
90+
adjustEditorHeightToContent = false,
9191
}) => {
9292
if (cleanData) {
9393
value = cleanKubeManifest(value)

src/Common/CodeEditor/types.ts

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export interface InformationBarProps {
2222
children?: React.ReactNode
2323
}
2424

25-
export interface CodeEditorInterface {
25+
interface CodeEditorBaseInterface {
2626
value?: string
2727
lineDecorationsWidth?: number
2828
responseType?: string
@@ -36,7 +36,6 @@ export interface CodeEditorInterface {
3636
readOnly?: boolean
3737
noParsing?: boolean
3838
inline?: boolean
39-
height?: number | string
4039
shebang?: string | JSX.Element
4140
diffView?: boolean
4241
loading?: boolean
@@ -48,9 +47,20 @@ export interface CodeEditorInterface {
4847
isKubernetes?: boolean
4948
cleanData?: boolean
5049
chartVersion?: any
51-
adjustEditorHeightToContent?: boolean
5250
}
5351

52+
export type CodeEditorInterface = CodeEditorBaseInterface &
53+
(
54+
| {
55+
adjustEditorHeightToContent?: boolean
56+
height?: never
57+
}
58+
| {
59+
adjustEditorHeightToContent?: never
60+
height?: number | string
61+
}
62+
)
63+
5464
export interface CodeEditorHeaderInterface {
5565
children?: any
5666
className?: string

0 commit comments

Comments
 (0)