Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
1 change: 0 additions & 1 deletion shesha-reactjs/src/components/sectionSeparator/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ export const SectionSeparator: FC<ISectionSeparatorProps> = ({
...containerStyle,
height: 'max-content',
width: addPx(lineWidth, allData) ?? '100%',
marginRight: 1,
}}
key={id}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ const AttachmentsEditor: IToolboxComponent<IAttachmentsEditorProps> = {
type: 'attachmentsEditor',
isInput: true,
name: 'File list',
preserveDimensionsInDesigner: true,
dataTypeSupported: ({ dataType, dataFormat }) => dataType === DataTypes.advanced && dataFormat === AdvancedFormats.fileList,
icon: <FolderAddOutlined />,
Factory: ({ model }) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const ContainerComponent: ContainerComponentDefinition = {
justifySelf: model.justifySelf,
noDefaultStyling: model.noDefaultStyling,
gridColumnsCount: model.gridColumnsCount,
flexWrap: model.flexWrap,
flexWrap: model?.flexDirection?.includes('row') ? model.flexWrap : 'unset',
gap: addPx(model.gap, allData),
}), [
model.display,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ const DateField: DateFieldDefinition = {
const finalStyle = useMemo(() => !model.enableStyleOnReadonly && model.readOnly ? {
...model.allStyles.fontStyles,
...model.allStyles.dimensionsStyles,
width: '100%',
height: '100%',
} : model.allStyles.fullStyle, [model.enableStyleOnReadonly, model.readOnly, model.allStyles]);

return (
Expand Down
22 changes: 9 additions & 13 deletions shesha-reactjs/src/designer-components/multiColorInput/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { useTheme } from '@/providers';
import { removeUndefinedProps } from '@/utils/object';
import { SettingInput } from '../settingsInput/settingsInput';
import { gradientDirectionOptions } from '../_settings/utils/background/utils';
import { InputRow } from '../settingsInputRow';
import { ReactElement } from 'react-markdown/lib/react-markdown';

type MultiColorInputProps = {
Expand Down Expand Up @@ -70,18 +69,15 @@ export const MultiColorInput = ({ value = {}, onChange, readOnly, propertyName }
>
</Button>
</Row>

<InputRow inline={true} readOnly={readOnly}>
<SettingInput
id={directionInputId}
propertyName={propertyName.replace('gradient.colors', 'gradient.direction')}
label="Direction"
hideLabel={true}
width="120px"
type="dropdown"
dropdownOptions={gradientDirectionOptions}
/>
</InputRow>
<SettingInput
id={directionInputId}
propertyName={propertyName.replace('gradient.colors', 'gradient.direction')}
label="Direction"
hideLabel={true}
width="120px"
type="dropdown"
dropdownOptions={gradientDirectionOptions}
/>
</>
);
};
Expand Down
3 changes: 2 additions & 1 deletion shesha-reactjs/src/designer-components/radio/radioGroup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { isAjaxSuccessResponse } from '@/interfaces/ajaxResponse';
import { ILabelValue } from '../dropdown/model';
import { executeScriptSync } from '@/providers/form/utils';
import { IRadioProps } from './interfaces';
import { DEFAULT_MARGINS } from '@/components/formDesigner/utils/designerConstants';

type FetchResponse = ILabelValue<any>[] | {
items?: ILabelValue<any>[];
Expand Down Expand Up @@ -58,7 +59,7 @@ const RadioGroup: FC<IRadioProps> = (model) => {
onChange={onChange}
style={model.style}
>
<Space direction={model.direction}>
<Space direction={model.direction} style={{ margin: `${DEFAULT_MARGINS.vertical}px ${DEFAULT_MARGINS.horizontal}px` }}>
{options?.map((checkItem, index) => (
<Radio key={index} value={`${checkItem.value}`} disabled={model.readOnly}>
{checkItem.label}
Expand Down
Loading