Skip to content

Commit

Permalink
Merge branch 'main' into fix/tabview/children
Browse files Browse the repository at this point in the history
  • Loading branch information
ssong10 authored Jun 17, 2024
2 parents ea73ba4 + 0a0d978 commit be54a33
Show file tree
Hide file tree
Showing 42 changed files with 569 additions and 16 deletions.
2 changes: 2 additions & 0 deletions packages/utils-eslint-config/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

### [0.89.16](https://github.com/pedaling/opensource/compare/utils-eslint-config-0.89.15...utils-eslint-config-0.89.16) (2024-06-03)

### [0.89.15](https://github.com/pedaling/opensource/compare/utils-eslint-config-0.89.14...utils-eslint-config-0.89.15) (2024-05-27)

### [0.89.14](https://github.com/pedaling/opensource/compare/utils-eslint-config-0.89.13...utils-eslint-config-0.89.14) (2024-05-27)
Expand Down
2 changes: 1 addition & 1 deletion packages/utils-eslint-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@class101/eslint-config",
"version": "0.89.15",
"version": "0.89.16",
"private": false,
"sideEffects": false,
"main": "src/index.js",
Expand Down
2 changes: 2 additions & 0 deletions packages/vibrant-components-web/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

### [0.92.16](https://github.com/pedaling/opensource/compare/vibrant-components-web-0.92.15...vibrant-components-web-0.92.16) (2024-06-03)

### [0.92.15](https://github.com/pedaling/opensource/compare/vibrant-components-web-0.92.14...vibrant-components-web-0.92.15) (2024-05-27)

### [0.92.14](https://github.com/pedaling/opensource/compare/vibrant-components-web-0.92.13...vibrant-components-web-0.92.14) (2024-05-27)
Expand Down
2 changes: 1 addition & 1 deletion packages/vibrant-components-web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vibrant-ui/components-web",
"version": "0.92.15",
"version": "0.92.16",
"private": false,
"sideEffects": false,
"peerDependencies": {
Expand Down
7 changes: 7 additions & 0 deletions packages/vibrant-components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

### [0.92.16](https://github.com/pedaling/opensource/compare/vibrant-components-0.92.15...vibrant-components-0.92.16) (2024-06-03)


### Features

* school, toteBagPlay 아이콘을 추가한다. ([#955](https://github.com/pedaling/opensource/issues/955)) ([300747d](https://github.com/pedaling/opensource/commit/300747d9a1f1100d573959d0de8142607a090fbf))

### [0.92.15](https://github.com/pedaling/opensource/compare/vibrant-components-0.92.14...vibrant-components-0.92.15) (2024-05-27)


Expand Down
2 changes: 1 addition & 1 deletion packages/vibrant-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vibrant-ui/components",
"version": "0.92.15",
"version": "0.92.16",
"private": false,
"sideEffects": false,
"peerDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ exports[`<Spinner /> when Spinner rendered match snapshot 1`] = `
<span
class="emotion-0"
data-testid="spinner"
style="transform: rotate(0deg);"
/>
</div>
`;
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ import { BrowserTesting, createReactRenderer } from '@vibrant-ui/utils/testing-w
import { Tab } from '../Tab';
import { TabGroup } from './TabGroup';

jest.mock('@vibrant-ui/core', () => ({
...jest.requireActual('@vibrant-ui/core'),
useResponsiveValue: jest.fn().mockReturnValue({ breakpointIndex: 2 }),
}));

describe('<TabGroup />', () => {
const { render } = createReactRenderer();

Expand Down
7 changes: 7 additions & 0 deletions packages/vibrant-core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

### [0.92.16](https://github.com/pedaling/opensource/compare/vibrant-core-0.92.15...vibrant-core-0.92.16) (2024-06-03)


### Features

* school, toteBagPlay 아이콘을 추가한다. ([#955](https://github.com/pedaling/opensource/issues/955)) ([300747d](https://github.com/pedaling/opensource/commit/300747d9a1f1100d573959d0de8142607a090fbf))

### [0.92.15](https://github.com/pedaling/opensource/compare/vibrant-core-0.92.14...vibrant-core-0.92.15) (2024-05-27)

### [0.92.14](https://github.com/pedaling/opensource/compare/vibrant-core-0.92.13...vibrant-core-0.92.14) (2024-05-27)
Expand Down
2 changes: 1 addition & 1 deletion packages/vibrant-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vibrant-ui/core",
"version": "0.92.15",
"version": "0.92.16",
"private": false,
"sideEffects": false,
"react-native": "index.native",
Expand Down
13 changes: 10 additions & 3 deletions packages/vibrant-core/src/lib/TextInput/TextInput.native.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import { forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
import type { KeyboardTypeOptions, TextInputProps as RNTextInputProps } from 'react-native';
import type {
KeyboardTypeOptions,
NativeSyntheticEvent,
TextInputProps as RNTextInputProps,
TextInputKeyPressEventData,
} from 'react-native';
import { TextInput as RNTextInput, StyleSheet } from 'react-native';
import styled from '@emotion/native';
import { createShouldForwardProp } from '../createShouldForwardProp';
Expand Down Expand Up @@ -110,8 +115,10 @@ export const TextInput = forwardRef<TextInputRef, TextInputProps>(

onBlur?.();
}}
onKeyPress={event => onKeyPress?.({ key: event.nativeEvent.key, prevent: () => event.preventDefault() })}
onChangeText={value => {
onKeyPress={(event: NativeSyntheticEvent<TextInputKeyPressEventData>) =>
onKeyPress?.({ key: event.nativeEvent.key, prevent: () => event.preventDefault() })
}
onChangeText={(value: string) => {
const replacedValue = replaceValue({ pattern, value });

let isPrevented = false;
Expand Down
5 changes: 3 additions & 2 deletions packages/vibrant-core/src/lib/TextInput/TextInput.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
import type { FormEvent, KeyboardEvent } from 'react';
import styled from '@emotion/styled';
import { createShouldForwardProp } from '../createShouldForwardProp';
import type { SystemProps, TextInputProps, TextInputRef } from './TextInputProps';
Expand Down Expand Up @@ -97,7 +98,7 @@ export const TextInput = forwardRef<TextInputRef, TextInputProps>(

onBlur?.();
}}
onKeyDown={event => {
onKeyDown={(event: KeyboardEvent<HTMLInputElement>) => {
const { key } = event.nativeEvent;

if (key === 'Enter') {
Expand All @@ -108,7 +109,7 @@ export const TextInput = forwardRef<TextInputRef, TextInputProps>(

onKeyPress?.({ key, prevent: () => event.preventDefault() });
}}
onInput={event => {
onInput={(event: FormEvent<HTMLInputElement>) => {
const replacedValue = replaceValue({
pattern: type === 'number' ? /\d/ : pattern,
value: event.currentTarget.value,
Expand Down
2 changes: 2 additions & 0 deletions packages/vibrant-forms/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

### [0.92.16](https://github.com/pedaling/opensource/compare/vibrant-forms-0.92.15...vibrant-forms-0.92.16) (2024-06-03)

### [0.92.15](https://github.com/pedaling/opensource/compare/vibrant-forms-0.92.14...vibrant-forms-0.92.15) (2024-05-27)

### [0.92.14](https://github.com/pedaling/opensource/compare/vibrant-forms-0.92.13...vibrant-forms-0.92.14) (2024-05-27)
Expand Down
2 changes: 1 addition & 1 deletion packages/vibrant-forms/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vibrant-ui/forms",
"version": "0.92.15",
"version": "0.92.16",
"private": false,
"sideEffects": false,
"peerDependencies": {
Expand Down
7 changes: 7 additions & 0 deletions packages/vibrant-icons/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

### [0.92.16](https://github.com/pedaling/opensource/compare/vibrant-icons-0.92.15...vibrant-icons-0.92.16) (2024-06-03)


### Features

* school, toteBagPlay 아이콘을 추가한다. ([#955](https://github.com/pedaling/opensource/issues/955)) ([300747d](https://github.com/pedaling/opensource/commit/300747d9a1f1100d573959d0de8142607a090fbf))

### [0.92.15](https://github.com/pedaling/opensource/compare/vibrant-icons-0.92.14...vibrant-icons-0.92.15) (2024-05-27)

### [0.92.14](https://github.com/pedaling/opensource/compare/vibrant-icons-0.92.13...vibrant-icons-0.92.14) (2024-05-27)
Expand Down
1 change: 1 addition & 0 deletions packages/vibrant-icons/assets/icons/School/Fill.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/vibrant-icons/assets/icons/School/Regular.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/vibrant-icons/assets/icons/School/Thin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/vibrant-icons/assets/icons/ToteBagPlay/Fill.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/vibrant-icons/assets/icons/ToteBagPlay/Thin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/vibrant-icons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vibrant-ui/icons",
"version": "0.92.15",
"version": "0.92.16",
"private": false,
"sideEffects": false,
"peerDependencies": {
Expand Down
Loading

0 comments on commit be54a33

Please sign in to comment.