Skip to content

[UIK-5338][input-number] rewrite component to TS #3016

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

Open
slizhevskyv-semrush wants to merge 2 commits into
base: release/v17
Choose a base branch
from
Open

[UIK-5338][input-number] rewrite component to TS #3016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1d868a
[UIK-5338][input-number] rewrite component to TS
slizhevskyv-semrush Jun 23, 2026
c78e3bd
[UIK-5338][input-number] rewrite component to TS
slizhevskyv-semrush Jun 23, 2026
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
8 changes: 6 additions & 2 deletions playground/entries/InputNumber.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
import type { InputNumberProps, InputNumberValueProps, InputNumberControlsProps } from '@semcore/ui/input-number';
import type { NSInputNumber } from '@semcore/ui/input-number';
import InputNumber from '@semcore/ui/input-number';
import React from 'react';

import type { JSXProps } from '../types/JSXProps';
import type { PlaygroundEntry } from '../types/Playground';
import createGithubLink from '../utils/createGHLink';

export type InputNumberJSXProps = JSXProps<InputNumberProps & InputNumberValueProps & InputNumberControlsProps>;
export type InputNumberJSXProps = JSXProps<
NSInputNumber.Props &
NSInputNumber.Value.Props &
NSInputNumber.Controls.Props
>;

function getJSX(props: InputNumberJSXProps) {
return (
Expand Down
20 changes: 8 additions & 12 deletions semcore/core/src/core-types/Component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,18 +170,14 @@ export namespace Intergalactic {
: never;
};

type MergeChildProps<Root, Component> = {
[K in keyof Root | keyof Component]:
K extends keyof Root
? K extends keyof Component
? Root[K] & Component[K] extends never
? Root[K] | Component[K]
: Root[K] & Component[K]
: Root[K]
: K extends keyof Component
? Component[K]
: never
};
type MergeChildProps<Root, Component> =
Omit<Root, keyof Component> &
Omit<Component, keyof Root> &
{
[K in keyof Root & keyof Component]: Root[K] & Component[K] extends never

@ilyabrower ilyabrower Jun 24, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this work without an array wrapper?

Suggested change
[K in keyof Root & keyof Component]: Root[K] & Component[K] extends never
[K in keyof Root & keyof Component]: [Root[K] & Component[K]] extends [never]

? Root[K] | Component[K]
: Root[K] & Component[K];
};

type InferPropsFromRoot<
Root extends new (...args: any) => any,
Expand Down
4 changes: 2 additions & 2 deletions semcore/inline-input/src/InlineInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import i18nEnhance from '@semcore/core/lib/utils/enhances/i18nEnhance';
import { hasParent } from '@semcore/core/lib/utils/hasParent';
import CheckM from '@semcore/icon/Check/m';
import CloseM from '@semcore/icon/Close/m';
import InputNumber, { type InputNumberValueProps } from '@semcore/input-number';
import InputNumber, { type NSInputNumber } from '@semcore/input-number';
import Spin from '@semcore/spin';
import type { TooltipProps } from '@semcore/tooltip';
import React from 'react';
Expand Down Expand Up @@ -69,7 +69,7 @@ type ConfirmControlAsProps = ControlAsProps & {
type CancelControlAsProps = ControlAsProps & {
onCancel?: OnCancel;
};
type NumberValueAsProps = InputNumberValueProps & {
type NumberValueAsProps = NSInputNumber.Value.Props & {
increment?: (event: WheelEvent) => void;
decrement?: (event: WheelEvent) => void;
};
Expand Down
4 changes: 2 additions & 2 deletions semcore/inline-input/src/index.type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { BoxProps } from '@semcore/base-components';
import type { ButtonLinkComponent } from '@semcore/button';
import type { PropGetterFn, Intergalactic } from '@semcore/core';
import type { InputNumberControlsProps } from '@semcore/input-number';
import type { NSInputNumber } from '@semcore/input-number';
import type React from 'react';

export type InlineInputProps = BoxProps & {
Expand Down Expand Up @@ -123,5 +123,5 @@ export type InlineInputComponent = Intergalactic.Component<'div', InlineInputPro
InlineInputProps
>;
NumberValue: Intergalactic.Component<'div', {}, InlineInputProps>;
NumberControls: Intergalactic.Component<'div', InputNumberControlsProps, InlineInputProps>;
NumberControls: Intergalactic.Component<'div', NSInputNumber.Controls.Props, InlineInputProps>;
};
2 changes: 1 addition & 1 deletion semcore/input-number/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "UI-kit team <ui-kit-team@semrush.com>",
"license": "MIT",
"scripts": {
"build": "pnpm semcore-builder --source=js && pnpm vite build"
"build": "pnpm semcore-builder && pnpm vite build"
},
"exports": {
"types": "./lib/types/index.d.ts",
Expand Down
Loading
Loading