Skip to content
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.

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

Implement HTML component and cleanup Text component #999

Merged
merged 7 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
116 changes: 46 additions & 70 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/form-js-carbon-styles/src/carbon-styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@

// Markdown styles /////////////

.fjs-container .fjs-form-field.fjs-form-field-text .markup {
.fjs-container .fjs-form-field.fjs-form-field-text {
font-size: var(--cds-body-long-01-font-size);
font-weight: var(--cds-body-long-01-font-weight);
line-height: var(--cds-body-long-01-line-height);
Expand Down
7 changes: 6 additions & 1 deletion packages/form-js-carbon-styles/test/spec/complex.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
"type": "text",
"id": "Field_1bbbwwg"
},
{
"type": "html",
"content": "<p style='color: green; font-size: 24px'>Some big green text</p>",
"id": "Field_1bbbwwh"
},
{
"id": "Group_1a82jj2",
"label": "I am a group",
Expand Down Expand Up @@ -680,5 +685,5 @@
"name": "Camunda Modeler",
"version": "5.7.0-nightly.20230103"
},
"schemaVersion": 9
"schemaVersion": 15
}
10 changes: 10 additions & 0 deletions packages/form-js-editor/assets/form-js-editor-base.css
Original file line number Diff line number Diff line change
Expand Up @@ -752,6 +752,10 @@
margin: 0px 12px 6px
}

.fjs-properties-container .fjs-properties-panel .cm-editor {
max-height: 400px;
}

/**
* Editor Form Fields
*/
Expand All @@ -773,6 +777,12 @@
background: repeating-linear-gradient( 45deg, #ffffff, #ffffff 10px, #f5f5f5 10px, #f5f5f5 20px);
}


.fjs-editor-container .fjs-form-field-html,
.fjs-editor-container .fjs-form-field-text {
min-height: 30px;
}

.fjs-editor-container .fjs-form-field-separator hr {
margin: 10px 2px;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ import { getPaletteIcon } from '../palette/components/Palette';

import { useService } from './hooks';

const headerlessTypes = [
'spacer',
'separator',
'html'
];

export const PropertiesPanelHeaderProvider = {

Expand All @@ -16,7 +21,7 @@ export const PropertiesPanelHeaderProvider = {
type
} = field;

if (type === 'spacer') {
if (headerlessTypes.includes(type)) {
return '';
}

Expand Down
Loading
Loading