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

Fix #6160: InputText className listed twice #6161

Merged
merged 1 commit into from
Mar 15, 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
2 changes: 1 addition & 1 deletion components/lib/hooks/useDisplayOrder.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { UniqueComponentId } from '../utils/Utils';
import { ObjectUtils, UniqueComponentId } from '../utils/Utils';

const groupToDisplayedElements = {};

Expand Down
4 changes: 2 additions & 2 deletions components/lib/inputtext/InputText.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useHandleStyle } from '../componentbase/ComponentBase';
import { useMergeProps } from '../hooks/Hooks';
import { KeyFilter } from '../keyfilter/KeyFilter';
import { Tooltip } from '../tooltip/Tooltip';
import { DomHandler, ObjectUtils, classNames } from '../utils/Utils';
import { DomHandler, ObjectUtils } from '../utils/Utils';
import { InputTextBase } from './InputTextBase';

export const InputText = React.memo(
Expand Down Expand Up @@ -71,7 +71,7 @@ export const InputText = React.memo(

const rootProps = mergeProps(
{
className: classNames(props.className, cx('root', { isFilled })),
className: cx('root', { isFilled }),
onBeforeInput: onBeforeInput,
onInput: onInput,
onKeyDown: onKeyDown,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`InputText when input has className only 1 className is printed 1`] = `
<div>
<input
class="jest p-inputtext p-component p-filled"
class="p-inputtext p-component jest p-filled"
data-pc-name="inputtext"
data-pc-section="root"
/>
Expand Down
Loading