Skip to content

fix(): fix minLines = 1 and placholder overflow #1274

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

Open
SailorF wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(): fix minLines = 1 and placholder overflow #1274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 23 additions & 0 deletions bricks/vs/src/code-editor/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,8 @@ export function CodeEditorComponent({
const maxLines = _maxLines ?? Infinity;
const height = _height ?? 500;
const [expanded, setExpanded] = useState(false);
const [placeholderInstance, setPlaceholderInstance] =
useState<PlaceholderContentWidget>();
const workerId = useMemo(() => uniqueId("worker"), []);

const { t } = useTranslation(NS);
Expand Down Expand Up @@ -909,11 +911,32 @@ export function CodeEditorComponent({
editorRef.current!
);

setPlaceholderInstance(placeholderWidget);

return () => {
placeholderWidget.dispose();
};
}, [placeholder]);

useEffect(() => {
if (
placeholderInstance &&
editorRef.current &&
editorRef.current.getDomNode
) {
const node = placeholderInstance.getDomNode();
const rect = node.getBoundingClientRect();
const originWidth = editorRef.current
?.getDomNode()
?.getBoundingClientRect().width;

editorRef.current?.layout({
width: originWidth!,
height: rect.height + 25,
Copy link
Member

@weareoutman weareoutman Aug 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个逻辑看不懂，并且影响了 fit-content 的示例

https://docs-preview-1274--next-bricks.netlify.app/playground/?mode=yaml&example=vs%2Fcode-editor%2Fautomatic%20layout%20-%20fit-content

});
}
}, [placeholderInstance]);

const handleCopyIconClick = useCallback(() => {
if (editorRef.current) {
const currentModel = editorRef.current.getModel()!;
Expand Down
2 changes: 1 addition & 1 deletion bricks/vs/src/code-editor/widget/Placeholder.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export class PlaceholderContentWidget implements monaco.editor.IContentWidget {
this.domNode.style.fontStyle = "italic";
this.domNode.style.color =
"rgba(var(--theme-gray-color-rgb-channel), 0.4)";
this.editor.applyFontInfo(this.domNode);
this.editor?.applyFontInfo?.(this.domNode);
}

return this.domNode;
Expand Down