From 049f1fd14b7d207faa9b74c1acc3143151f5ccbf Mon Sep 17 00:00:00 2001 From: Ethan Sharabi <1780255+ethanshar@users.noreply.github.com> Date: Mon, 30 Sep 2024 17:17:32 +0300 Subject: [PATCH 01/33] Fix deps of docuilib package (#3279) --- docuilib/package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docuilib/package.json b/docuilib/package.json index 6aec574a1b..bce09edc61 100644 --- a/docuilib/package.json +++ b/docuilib/package.json @@ -1,6 +1,6 @@ { "name": "uilib-docs", - "version": "3.0.0", + "version": "3.1.0", "scripts": { "docusaurus": "docusaurus", "start": "docusaurus start", @@ -24,17 +24,17 @@ "docusaurus-plugin-sass": "^0.2.1", "file-loader": "^6.2.0", "prism-react-renderer": "^2.1.0", - "react": "^18.2.0", - "react-dom": "^18.2.0", - "react-native-linear-gradient": "2.6.2", - "react-native-reanimated": "^3.15.1", - "react-native-shimmer-placeholder": "^2.0.9", - "react-native-ui-lib": "snapshot", "react-native-web": "^0.19.12", "sass": "^1.39.0", "url-loader": "^4.1.1" }, "devDependencies": { + "react": "^18.2.0", + "react-dom": "^18.2.0", + "react-native-ui-lib": "snapshot", + "react-native-linear-gradient": "2.6.2", + "react-native-reanimated": "^3.15.1", + "react-native-shimmer-placeholder": "^2.0.9", "@docusaurus/module-type-aliases": "^3.5.2", "@docusaurus/types": "^3.5.2", "@tsconfig/docusaurus": "^1.0.4", From 3783e670edfdc47063bd11bd2c2620723896526b Mon Sep 17 00:00:00 2001 From: Adi Mordo Date: Sun, 6 Oct 2024 12:18:09 +0300 Subject: [PATCH 02/33] react live scope components export (#3286) * react live scope components export * parych version update --- docuilib/package.json | 2 +- docuilib/src/index.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 docuilib/src/index.ts diff --git a/docuilib/package.json b/docuilib/package.json index bce09edc61..fd8dc829a0 100644 --- a/docuilib/package.json +++ b/docuilib/package.json @@ -1,6 +1,6 @@ { "name": "uilib-docs", - "version": "3.1.0", + "version": "3.1.1", "scripts": { "docusaurus": "docusaurus", "start": "docusaurus start", diff --git a/docuilib/src/index.ts b/docuilib/src/index.ts new file mode 100644 index 0000000000..f91df8238c --- /dev/null +++ b/docuilib/src/index.ts @@ -0,0 +1 @@ +export {default as ReactLiveScope} from './theme/ReactLiveScope'; From d56c1875d14e6e8495525a1b84a7de5e2fa8cba1 Mon Sep 17 00:00:00 2001 From: Adi Mordo Date: Sun, 6 Oct 2024 14:21:44 +0300 Subject: [PATCH 03/33] uilib-docs src index export (#3291) --- docuilib/index.js | 1 + docuilib/package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 docuilib/index.js diff --git a/docuilib/index.js b/docuilib/index.js new file mode 100644 index 0000000000..3fc779821a --- /dev/null +++ b/docuilib/index.js @@ -0,0 +1 @@ +module.exports = require('./src'); diff --git a/docuilib/package.json b/docuilib/package.json index fd8dc829a0..d0832a9407 100644 --- a/docuilib/package.json +++ b/docuilib/package.json @@ -1,6 +1,6 @@ { "name": "uilib-docs", - "version": "3.1.1", + "version": "3.1.2", "scripts": { "docusaurus": "docusaurus", "start": "docusaurus start", From 1c77d6b20fad0497e4df936302d7e6148093c41c Mon Sep 17 00:00:00 2001 From: M-i-k-e-l Date: Sun, 6 Oct 2024 16:36:25 +0300 Subject: [PATCH 04/33] Change script name to releaseDemo --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 76624636b8..4342ca8724 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,8 @@ "docs:build": "node scripts/buildDocs.js", "calendar:createMocks": "node scripts/createCalendarMockData.js", "snippets:build": "node scripts/generateSnippets.js", - "demo": "./scripts/demo.sh", - "release": "node ./scripts/release.js" + "release": "node ./scripts/release.js", + "releaseDemo": "./scripts/demo.sh" }, "dependencies": { "babel-plugin-transform-inline-environment-variables": "^0.0.2", From 143f62718165428e87412b5b7d83a348bcba5fab Mon Sep 17 00:00:00 2001 From: Inbal Tish <33805983+Inbal-Tish@users.noreply.github.com> Date: Mon, 7 Oct 2024 13:49:57 +0300 Subject: [PATCH 05/33] Button driver - add getStyle (#3296) * Button driver - add getStyle * remove type --- src/components/button/Button.driver.new.ts | 6 +++- .../button/__tests__/index.driver.spec.tsx | 33 +++++++++++-------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/components/button/Button.driver.new.ts b/src/components/button/Button.driver.new.ts index 1160c84c1a..2c0cec1f97 100644 --- a/src/components/button/Button.driver.new.ts +++ b/src/components/button/Button.driver.new.ts @@ -30,5 +30,9 @@ export const ButtonDriver = (props: ComponentProps) => { return StyleSheet.flatten(iconDriver?.getElement().props.style); }; - return {getLabel, getLabelStyle, getIconStyle, getIcon, ...driver}; + const getStyle = () => { + return StyleSheet.flatten(driver.getElement().props.style); + }; + + return {getStyle, getLabel, getLabelStyle, getIconStyle, getIcon, ...driver}; }; diff --git a/src/components/button/__tests__/index.driver.spec.tsx b/src/components/button/__tests__/index.driver.spec.tsx index d42eb83b47..3ce8aa3917 100644 --- a/src/components/button/__tests__/index.driver.spec.tsx +++ b/src/components/button/__tests__/index.driver.spec.tsx @@ -2,10 +2,9 @@ import React, {useState} from 'react'; import {waitFor, render} from '@testing-library/react-native'; import View from '../../view'; import Text from '../../text'; -import Button from '../index'; -import {ImageSourcePropType} from 'react-native'; -import {ButtonDriver} from '../Button.driver.new'; import {TextDriver} from '../../text/Text.driver.new'; +import {ButtonDriver} from '../Button.driver.new'; +import Button, {ButtonProps} from '../index'; const BUTTON_ID = 'button_test_id'; const CHILDREN_TEXT_ID = 'children_test_id'; @@ -19,6 +18,18 @@ describe('Button', () => { expect(await buttonDriver.exists()).toBeTruthy(); }); + describe('style', () => { + it('should render a button with custom style', async () => { + const style = {borderWidth: 2, borderColor: 'green'}; + const renderTree = render(); + const buttonDriver = ButtonDriver({renderTree, testID: 'button_test_id'}); + + expect(buttonDriver.exists()).toBeTruthy(); + expect(await buttonDriver.getStyle().borderWidth).toEqual(style.borderWidth); + expect(await buttonDriver.getStyle().borderColor).toEqual(style.borderColor); + }); + }); + describe('custom button', () => { it('should render a custom button', async () => { const renderTree = render(); @@ -35,7 +46,7 @@ describe('Button', () => { }); }); - describe('OnPress', () => { + describe('onPress', () => { let onPressCallback: jest.Mock; beforeEach(() => (onPressCallback = jest.fn())); afterEach(() => onPressCallback.mockClear()); @@ -100,7 +111,7 @@ describe('Button', () => { describe('more complicated screen', () => { //todo take it out of this file. to the demo screens maybe it('should change text values according to state changes from buttons pressing', async () => { - const renderTree = render(StatefulScreenWithTextsAndButtonss()); + const renderTree = render(StatefulScreen()); const text1Driver = TextDriver({testID: `text_1`, renderTree}); const text2Driver = TextDriver({testID: `text_2`, renderTree}); const button2Driver = ButtonDriver({testID: `${BUTTON_ID}2`, renderTree}); @@ -119,16 +130,10 @@ describe('Button', () => { }); }); -function WrapperScreenWithButton(buttonProps: { - onPress?: () => void; - label?: string; - iconSource?: ImageSourcePropType; - disabled?: boolean; - } = {}) { - const {onPress, label, iconSource, disabled} = buttonProps; +function WrapperScreenWithButton(buttonProps: ButtonProps = {}) { return ( -