Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

[Feat]: #1883 add tab-index on buttons/checkbox/select#1911

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes fromall 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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { BoolCodeControl, StringControl } from "comps/controls/codeControl";
import { BoolCodeControl, StringControl, NumberControl } from "comps/controls/codeControl";
import { dropdownControl } from "comps/controls/dropdownControl";
import { ButtonEventHandlerControl } from "comps/controls/eventHandlerControl";
import { IconControl } from "comps/controls/iconControl";
Expand DownExpand Up@@ -137,7 +137,8 @@ const childrenMap = {
disabledStyle: DisabledButtonStyleControl,
animationStyle: styleControl(AnimationStyle, 'animationStyle'),
viewRef: RefControl<HTMLElement>,
tooltip: StringControl
tooltip: StringControl,
tabIndex: NumberControl
};

type ChildrenType = NewChildren<RecordConstructorToComp<typeof childrenMap>>;
Expand All@@ -162,8 +163,12 @@ const ButtonPropertyView = React.memo((props: {
disabledPropertyView(props.children),
hiddenPropertyView(props.children),
loadingPropertyView(props.children),
props.children.tabIndex.propertyView({ label: trans("prop.tabIndex") }),
]
: props.children.form.getPropertyView()}
: [
props.children.form.getPropertyView(),
props.children.tabIndex.propertyView({ label: trans("prop.tabIndex") }),
]}
</Section>
</>
)}
Expand DownExpand Up@@ -222,6 +227,7 @@ const ButtonView = React.memo((props: ToViewReturn<ChildrenType>) => {
(!isDefault(props.type) && getForm(editorState, props.form)?.disableSubmit())
}
onClick={handleClick}
tabIndex={typeof props.tabIndex === 'number' ? props.tabIndex : undefined}
>
{props.prefixIcon && <IconWrapper>{props.prefixIcon}</IconWrapper>}
{
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { default as Button } from "antd/es/button";
import { ButtonCompWrapper, buttonRefMethods } from "comps/comps/buttonComp/buttonCompConstants";
import { BoolCodeControl, StringControl } from "comps/controls/codeControl";
import { BoolCodeControl, StringControl, NumberControl } from "comps/controls/codeControl";
import { ButtonEventHandlerControl } from "comps/controls/eventHandlerControl";
import { styleControl } from "comps/controls/styleControl";
import { AnimationStyle, AnimationStyleType, LinkStyle, LinkStyleType } from "comps/controls/styleControlConstants";
Expand DownExpand Up@@ -91,6 +91,7 @@ const LinkTmpComp = (function () {
prefixIcon: IconControl,
suffixIcon: IconControl,
viewRef: RefControl<HTMLElement>,
tabIndex: NumberControl,
};
return new UICompBuilder(childrenMap, (props) => {
// chrome86 bug: button children should not contain only empty span
Expand All@@ -105,6 +106,7 @@ const LinkTmpComp = (function () {
disabled={props.disabled}
onClick={() => props.onEvent("click")}
type={"link"}
tabIndex={typeof props.tabIndex === 'number' ? props.tabIndex : undefined}
>
{hasChildren && (
<span>
Expand All@@ -131,6 +133,7 @@ const LinkTmpComp = (function () {
{hiddenPropertyView(children)}
{loadingPropertyView(children)}
{showDataLoadingIndicatorsPropertyView(children)}
{children.tabIndex.propertyView({ label: trans("prop.tabIndex") })}
</Section>
<Section name={sectionNames.advanced}>
{children.prefixIcon.propertyView({ label: trans("button.prefixIcon") })}
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { BoolCodeControl, StringControl } from "comps/controls/codeControl";
import { BoolCodeControl, StringControl, NumberControl } from "comps/controls/codeControl";
import { withDefault } from "comps/generators";
import { UICompBuilder } from "comps/generators/uiCompBuilder";
import {
Expand DownExpand Up@@ -68,6 +68,7 @@ const ToggleTmpComp = (function () {
showBorder: withDefault(BoolControl, true),
viewRef: RefControl<HTMLElement>,
tooltip: StringControl,
tabIndex: NumberControl,
};
return new UICompBuilder(childrenMap, (props) => {
const text = props.showText
Expand All@@ -92,6 +93,7 @@ const ToggleTmpComp = (function () {
props.onEvent("change");
props.value.onChange(!props.value.value);
}}
tabIndex={typeof props.tabIndex === 'number' ? props.tabIndex : undefined}
>
{props.iconPosition === "right" && text}
{<IconWrapper>{props.value.value ? props.trueIcon : props.falseIcon}</IconWrapper>}
Expand All@@ -117,6 +119,7 @@ const ToggleTmpComp = (function () {
{hiddenPropertyView(children)}
{loadingPropertyView(children)}
{showDataLoadingIndicatorsPropertyView(children)}
{children.tabIndex.propertyView({ label: trans("prop.tabIndex") })}
</Section>
<Section name={sectionNames.advanced}>
{children.showText.propertyView({ label: trans("toggleButton.showText") })}
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { BoolCodeControl, StringControl } from "comps/controls/codeControl";
import { BoolCodeControl, StringControl, NumberControl } from "comps/controls/codeControl";
import { dropdownControl } from "comps/controls/dropdownControl";
import { ButtonEventHandlerControl } from "comps/controls/eventHandlerControl";
import { IconControl } from "comps/controls/iconControl";
Expand DownExpand Up@@ -204,7 +204,8 @@ const childrenMap = {
style: ButtonStyleControl,
viewRef: RefControl<HTMLElement>,
restrictPaddingOnRotation:withDefault(StringControl, 'controlButton'),
tooltip: StringControl
tooltip: StringControl,
tabIndex: NumberControl
};

let ButtonTmpComp = (function () {
Expand DownExpand Up@@ -294,6 +295,7 @@ let ButtonTmpComp = (function () {
? handleClickEvent()
: submitForm(editorState, props.form)
}
tabIndex={typeof props.tabIndex === 'number' ? props.tabIndex : undefined}
>
{props.sourceMode === 'standard' && props.prefixIcon && (
<IconWrapper
Expand DownExpand Up@@ -342,6 +344,7 @@ let ButtonTmpComp = (function () {
{disabledPropertyView(children)}
{hiddenPropertyView(children)}
{loadingPropertyView(children)}
{children.tabIndex.propertyView({ label: trans("prop.tabIndex") })}
</Section>
)}

Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,8 +214,20 @@ let CheckboxBasicComp = (function () {

return new UICompBuilder(childrenMap, (props) => {
const mountedRef = useRef(true);
const checkboxRef = useRef<HTMLDivElement | null>(null);
const [validateState, handleChange] = useSelectInputValidate(props);

useEffect(() => {
if (!mountedRef.current) return;
if (checkboxRef.current && typeof props.tabIndex === 'number') {
const checkboxInputs = checkboxRef.current.querySelectorAll('input[type="checkbox"]');
checkboxInputs.forEach((input, index) => {
// Set sequential tabindex for each checkbox
input.setAttribute('tabindex', (props.tabIndex + index).toString());
});
}
}, [props.tabIndex, props.options]);

useEffect(() => {
return () => {
mountedRef.current = false;
Expand DownExpand Up@@ -251,7 +263,13 @@ let CheckboxBasicComp = (function () {
layout={props.layout}
options={filteredOptions()}
onChange={handleValidateChange}
viewRef={props.viewRef}
viewRef={(el) => {
if (!mountedRef.current) return;
if (el) {
props.viewRef(el);
checkboxRef.current = el;
}
}}
tabIndex={typeof props.tabIndex === 'number' ? props.tabIndex : undefined}
/>
),
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import {
} from "lowcoder-core";
import { BoolControl } from "../../controls/boolControl";
import { LabelControl } from "../../controls/labelControl";
import { BoolCodeControl, StringControl } from "../../controls/codeControl";
import { BoolCodeControl, StringControl, NumberControl } from "../../controls/codeControl";
import { PaddingControl } from "../../controls/paddingControl";
import { MarginControl } from "../../controls/marginControl";
import {
Expand DownExpand Up@@ -242,6 +242,7 @@ export const SelectChildrenMap = {
margin: MarginControl,
padding: PaddingControl,
inputFieldStyle:styleControl(SelectStyle),
tabIndex: NumberControl,
...SelectInputValidationChildren,
...formDataChildren,
};
Expand DownExpand Up@@ -269,6 +270,7 @@ export const SelectUIView = (
placeholder={props.placeholder}
value={props.value}
showSearch={props.showSearch}
tabIndex={typeof props.tabIndex === 'number' ? props.tabIndex : undefined}
filterOption={(input, option) => {
if (!option) return false;
return String(option.label ?? option.value ?? "").toLowerCase().includes(input.toLowerCase());
Expand DownExpand Up@@ -348,6 +350,7 @@ export const SelectPropertyView = (
{disabledPropertyView(children)}
{hiddenPropertyView(children)}
{showDataLoadingIndicatorsPropertyView(children as any)}
{children.tabIndex.propertyView({ label: trans("prop.tabIndex") })}
</Section>
</>
)}
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp