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.

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

Jump to bottom

feat(reference): ACT-1471 - Add UI Enhancements #1395

Merged
merged 1 commit into from
Jul 9, 2024
Merged

feat(reference): ACT-1471 - Add UI Enhancements #1395

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
6 changes: 3 additions & 3 deletions src/components/ParserOpenRPC/InteractiveBox/fields/ConditionalField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ export const ConditionalField = (props: FieldTemplateProps) => {
<div className={styles.tableColumn}>
<div className={clsx(styles.tableValueRow, styles.tableValueRowPadding)}>
{formData === undefined ? "" : String(formData)}
<span className={styles.tableColumnType}>
<span className={styles.dropdown} onClick={() => { setIsOpened(!isOpened); }}>
<span className={clsx(styles.tableColumnType, styles.tableColumnTypeDropdown)} onClick={() => { setIsOpened(!isOpened); }}>
<span className={styles.dropdown}>
{schema?.anyOf ? "anyOf" : "oneOf"}
<span className={clsx(styles.tableColumnIcon, styles.chevronIcon, styles.dropdownChevronIcon, !isOpened && styles.chevronIconDown)}/>
<span className={clsx(styles.chevronIcon, styles.dropdownChevronIcon, !isOpened && styles.chevronIconDown)}/>
Expand All @@ -77,7 +77,7 @@ export const ConditionalField = (props: FieldTemplateProps) => {
onClick={onDropdownOptionClick}
data-value={listItem.title}
>
{`${listItem.title}: ${listItem?.enum ? "enum" : listItem.type}`}
{listItem.title}
</li>
))}
</ul>
Expand Down
7 changes: 7 additions & 0 deletions src/components/ParserOpenRPC/InteractiveBox/styles.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,13 @@
line-height: 24px;
font-size: 14px;
}
.tableColumnTypeDropdown {
width: 100%;
justify-content: flex-end;
}
.tableColumnTypeDropdown:hover {
cursor: pointer;
}
.tableLabelIconError {
width: 11px;
height: 11px;
Expand Down
12 changes: 10 additions & 2 deletions src/components/ParserOpenRPC/InteractiveBox/templates/ArrayFieldTemplate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import styles from "@site/src/components/ParserOpenRPC/InteractiveBox/styles.mod
import clsx from "clsx";
import { ParserOpenRPCContext } from "@site/src/components/ParserOpenRPC";

export const ArrayFieldTemplate = ({ items, canAdd, onAddClick, title, schema, formData, formContext }: ArrayFieldTemplateProps) => {
export const ArrayFieldTemplate = ({ items, canAdd, onAddClick, title, schema, formData }: ArrayFieldTemplateProps) => {
const [isComplexArrayEditView, setIsComplexArrayEditView] = useState(false);
const { setIsDrawerContentFixed, setDrawerLabel, isComplexTypeView, setIsComplexTypeView } = useContext(ParserOpenRPCContext);
const { collapsed, toggleCollapsed } = useCollapsible({ initialState: true });
Expand All @@ -19,6 +19,12 @@ export const ArrayFieldTemplate = ({ items, canAdd, onAddClick, title, schema, f
setIsComplexArrayEditView(true);
setIsComplexTypeView(true);
}
const addSimpleArray = () => {
toggleCollapsed();
if(collapsed && formData?.length === 0) {
onAddClick();
}
}

return (
<div>
Expand All @@ -31,7 +37,9 @@ export const ArrayFieldTemplate = ({ items, canAdd, onAddClick, title, schema, f
<div className={styles.arrayFormDataWrap}>
{JSON.stringify(formData, null, " ")}
</div>
<span className={styles.tableColumnType} onClick={isSimpleArray ? toggleCollapsed : addComplexArray}>
<span
className={clsx(styles.tableColumnType, styles.tableColumnTypeDropdown)}
onClick={isSimpleArray ? addSimpleArray : addComplexArray}>
<span className={styles.dropdown}>
{schema.type}
<span className={
Expand Down
4 changes: 2 additions & 2 deletions src/components/ParserOpenRPC/InteractiveBox/widgets/DropdownWidget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ export const DropdownWidget = ({ name, value, onChange, schema, options }: Widge
<div className={styles.tableColumn}>
<div className={clsx(styles.tableValueRow, styles.tableValueRowPadding)}>
{value === undefined ? "" : String(value)}
<span className={styles.tableColumnType}>
<span className={styles.dropdown} onClick={() => { setIsOpened(!isOpened); }}>
<span className={clsx(styles.tableColumnType, styles.tableColumnTypeDropdown)} onClick={() => { setIsOpened(!isOpened); }}>
<span className={styles.dropdown}>
{schema.type}
<span className={clsx(styles.tableColumnIcon, styles.chevronIcon, styles.dropdownChevronIcon, !isOpened && styles.chevronIconDown)}/>
<span className={clsx(styles.chevronIcon, styles.dropdownChevronIcon, !isOpened && styles.chevronIconDown)}/>
Expand Down
4 changes: 2 additions & 2 deletions src/components/ParserOpenRPC/InteractiveBox/widgets/SelectWidget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ export const SelectWidget = ({ value, onChange, schema, options, label }: Widget
<div className={styles.tableColumn}>
<div className={clsx(styles.tableValueRow, styles.tableValueRowPadding)}>
{emptyValue ? "" : String(value)}
<span className={styles.tableColumnType}>
<span className={styles.dropdown} onClick={() => { setIsOpened(!isOpened); }}>
<span className={clsx(styles.tableColumnType, styles.tableColumnTypeDropdown)} onClick={() => { setIsOpened(!isOpened); }}>
<span className={styles.dropdown}>
{schema?.enum ? 'enum' : schema?.type}
<span className={clsx(styles.tableColumnIcon, styles.chevronIcon, styles.dropdownChevronIcon, !isOpened && styles.chevronIconDown)}/>
<span className={clsx(styles.chevronIcon, styles.dropdownChevronIcon, !isOpened && styles.chevronIconDown)}/>
Expand Down
3 changes: 1 addition & 2 deletions src/components/ParserOpenRPC/ModalDrawer/styles.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
transition-property: 'transform', 'opacity';
transition-duration: .4s;
transition-timing-function: ease;
box-shadow: 0 2px 40px 0 rgba(0, 0, 0, .1);
overflow: hidden;
background-color: #292A36;
}
Expand Down Expand Up @@ -97,7 +96,7 @@
overflow-y: hidden;
}

@media (width <= 996px) {
@media (width <= 1200px) {
.modalContainer {
position: fixed;
left: 0;
Expand Down
6 changes: 6 additions & 0 deletions src/css/custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,3 +328,9 @@ button:hover {
[data-theme="dark"] .tippy-popper[x-placement^=top] [x-arrow] {
border-top-color: rgba(255, 255, 255, 1);
}

@media (max-width: 1200px) {
.navbar__item {
font-size: 14px;
}
}