Merge branch 'refs/heads/main' into next

# Conflicts:
#	CHANGELOG.md
#	android/app/build.gradle
#	ios/MobyDick/Info.plist
#	ios/MobyDickTests/Info.plist
#	package.json
#	packages/KeyboardAware/package.json
#	packages/calendar/package.json
#	packages/chart/package.json
#	packages/core/package.json
#	packages/dragAndDrop/package.json
#	packages/markdown/package.json
#	packages/utils/package.json

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [7.34.1](https://github.com/lad-tech/mobydick/compare/v7.34.0...v7.34.1) (2024-09-05)
+
+
+### Bug Fixes
+
+* rating logic ([9699984](https://github.com/lad-tech/mobydick/commit/969998427bdbec423707a1ed1927c35e074aafa5))
+
 # [7.35.0-next.3](https://github.com/lad-tech/mobydick/compare/v7.35.0-next.2...v7.35.0-next.3) (2024-09-02)
 
 

package.json

@@ -101,4 +101,4 @@
   "engines": {
     "node": ">=18"
   }
-}
+}

packages/KeyboardAware/package.json

@@ -32,4 +32,4 @@
     "react-native": ">=0.66.4",
     "react": ">=17.0.2"
   }
-}
+}

packages/calendar/package.json

@@ -35,4 +35,4 @@
     "react-native-calendars": "^1.1292.0",
     "@lad-tech/mobydick-core": "7.35.0-next.3"
   }
-}
+}

packages/chart/package.json

@@ -39,4 +39,4 @@
     "react-native-reanimated": ">=3.6.1",
     "react-native-gesture-handler": ">=2.14.1"
   }
-}
+}

packages/core/package.json

@@ -39,4 +39,4 @@
   "dependencies": {
     "@tabler/icons-react-native": "^3.7.0"
   }
-}
+}

packages/core/src/other/components/Rating/Rating.tsx

@@ -19,24 +19,21 @@ const Rating: FC<TRating> = ({
   const [styles] = useStyles(stylesCreate);
   const ratingCount = Array(count).fill(0);
 
-  const handleRating = (startId: number) => {
-    if (!setCurrentRate) {
+  const handleRating = (starIndex: number) => {
+    const newRating = starIndex + 1;
+    if (currentRate === newRating) {
+      setCurrentRate(newRating - 1);
       return;
     }
-    if (currentRate === startId) {
-      setCurrentRate(currentRate + 1);
-      return;
-    }
-    setCurrentRate(startId);
+    setCurrentRate(newRating);
   };
 
   const stars = ratingCount.map((_, index) => (
     <Star
       key={'rating' + index}
       filled={index <= currentRate - 1}
-      starId={index}
+      starIndex={index}
       setRating={handleRating}
-      currentSelected={currentRate}
       iconStyle={iconStyle}
       iconSize={iconSize}
       fillColor={fillColor}

packages/core/src/other/components/Rating/__tests__/Rating.test.tsx

@@ -32,23 +32,9 @@ describe('Rating', () => {
     );
     expect(toJSON()).toMatchSnapshot();
   });
-  test('render rating 4', () => {
-    const onPress = jest.fn();
-    const {toJSON} = render(
-      <Rating count={4} setCurrentRate={onPress} currentRate={4} />,
-    );
-    expect(toJSON()).toMatchSnapshot();
-  });
-  test('render rating 5', () => {
-    const onPress = jest.fn();
-    const {toJSON} = render(
-      <Rating count={5} setCurrentRate={onPress} currentRate={5} />,
-    );
-    expect(toJSON()).toMatchSnapshot();
-  });
   test('change rating', () => {
     const onPress = jest.fn();
-    const {toJSON, getByLabelText} = render(
+    const {getByLabelText} = render(
       <Rating count={5} setCurrentRate={onPress} currentRate={2} />,
     );
     const setRatingButton = getByLabelText(`${LABELS.ratingStarButton}4`);
@@ -57,17 +43,11 @@ describe('Rating', () => {
       fireEvent.press(setRatingButton);
     });
 
-    expect(setRatingButton.props.accessibilityState).toHaveProperty(
-      'disabled',
-      undefined,
-    );
     expect(onPress).toHaveBeenCalledWith(4);
-
-    expect(toJSON()).toMatchSnapshot();
   });
   test('change rating is disabled', () => {
     const onPress = jest.fn();
-    const {toJSON, getByLabelText} = render(
+    const {getByLabelText} = render(
       <Rating
         count={5}
         setCurrentRate={onPress}
@@ -81,11 +61,6 @@ describe('Rating', () => {
       fireEvent.press(setRatingButton);
     });
 
-    expect(setRatingButton.props.accessibilityState).toHaveProperty(
-      'disabled',
-      true,
-    );
-
-    expect(toJSON()).toMatchSnapshot();
+    expect(onPress).toHaveBeenCalledTimes(0);
   });
 });