Skip to content

fix: Add RTL support #330

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Add RTL support #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 32 additions & 16 deletions src/components/CopilotModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
Platform,
StatusBar,
View,
I18nManager,
type LayoutChangeEvent,
type LayoutRectangle,
type ViewStyle,
Expand All @@ -34,6 +35,10 @@ type Props = CopilotOptions;

const noop = () => {};

const rtl = I18nManager.isRTL;
const start = rtl ? 'right' : 'left';
const end = rtl ? 'left' : 'right';

const makeDefaultLayout = (): LayoutRectangle => ({
x: 0,
y: 0,
Expand Down Expand Up @@ -128,12 +133,23 @@ export const CopilotModal = forwardRef<CopilotModalHandle, Props>(
rect.y -= StatusBar.currentHeight ?? 0;
}

let stepNumberLeft = rect.x - STEP_NUMBER_RADIUS;
let stepNumberLeft: number;

if (stepNumberLeft < 0) {
stepNumberLeft = rect.x + rect.width - STEP_NUMBER_RADIUS;
if (stepNumberLeft > newMeasuredLayout.width - STEP_NUMBER_DIAMETER) {
stepNumberLeft = newMeasuredLayout.width - STEP_NUMBER_DIAMETER;
if (!rtl) {
stepNumberLeft = rect.x - STEP_NUMBER_RADIUS;
if (stepNumberLeft < 0) {
stepNumberLeft = rect.x + rect.width - STEP_NUMBER_RADIUS;
if (stepNumberLeft > newMeasuredLayout.width - STEP_NUMBER_DIAMETER) {
stepNumberLeft = newMeasuredLayout.width - STEP_NUMBER_DIAMETER;
}
}
} else {
stepNumberLeft = (rect.x + rect.width) - STEP_NUMBER_RADIUS;
if (stepNumberLeft > newMeasuredLayout.width) {
stepNumberLeft = rect.x - STEP_NUMBER_RADIUS;
if (stepNumberLeft > newMeasuredLayout.width - STEP_NUMBER_DIAMETER) {
stepNumberLeft = newMeasuredLayout.width - STEP_NUMBER_DIAMETER;
}
}
}

Expand Down Expand Up @@ -166,20 +182,20 @@ export const CopilotModal = forwardRef<CopilotModalHandle, Props>(
}

if (horizontalPosition === "left") {
tooltip.right = Math.max(
tooltip[end] = Math.max(
newMeasuredLayout.width - (rect.x + rect.width),
0
);
tooltip.right =
tooltip.right === 0 ? tooltip.right + margin : tooltip.right;
tooltip.maxWidth = newMeasuredLayout.width - tooltip.right - margin;
arrow.right = tooltip.right + margin;
tooltip[end] =
tooltip[end] === 0 ? Number(tooltip[end]) + margin : tooltip[end];
tooltip.maxWidth = newMeasuredLayout.width - tooltip[end] - margin;
arrow[end] = Number(tooltip[end]) + margin;
} else {
tooltip.left = Math.max(rect.x, 0);
tooltip.left =
tooltip.left === 0 ? tooltip.left + margin : tooltip.left;
tooltip.maxWidth = newMeasuredLayout.width - tooltip.left - margin;
arrow.left = tooltip.left + margin;
tooltip[start] = Math.max(rect.x, 0);
tooltip[start] =
tooltip[start] === 0 ? Number(tooltip[start]) + margin : tooltip[start];
tooltip.maxWidth = newMeasuredLayout.width - tooltip[start] - margin;
arrow[start] = Number(tooltip[start]) + margin;
}

sanitize(arrow)
Expand Down Expand Up @@ -339,7 +355,7 @@ export const CopilotModal = forwardRef<CopilotModalHandle, Props>(
style={[
styles.stepNumberContainer,
{
left: animatedValues.stepNumberLeft,
[start]: animatedValues.stepNumberLeft,
top: Animated.add(animatedValues.top, -STEP_NUMBER_RADIUS),
},
]}
Expand Down
18 changes: 11 additions & 7 deletions src/components/ViewMask.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import React, { useCallback, useEffect, useRef, useState } from "react";

import { Animated, View } from "react-native";
import { Animated, View, I18nManager } from "react-native";
import { styles } from "./style";

import type { MaskProps, ValueXY } from "../types";

const rtl = I18nManager.isRTL;
const start = rtl ? 'right' : 'left';
const end = rtl ? 'left' : 'right';

export const ViewMask = (props: MaskProps) => {
const sizeValue = useRef<Animated.ValueXY>(
new Animated.ValueXY(props.size)
Expand Down Expand Up @@ -78,23 +82,23 @@ export const ViewMask = (props: MaskProps) => {
<View style={props.style} onStartShouldSetResponder={props.onClick}>
{[
{
right: leftOverlayRight,
[end]: leftOverlayRight,
backgroundColor: props.backdropColor,
},
{
left: rightOverlayLeft,
[start]: rightOverlayLeft,
backgroundColor: props.backdropColor,
},
{
top: bottomOverlayTopBoundary,
left: verticalOverlayLeftBoundary,
right: verticalOverlayRightBoundary,
[start]: verticalOverlayLeftBoundary,
[end]: verticalOverlayRightBoundary,
backgroundColor: props.backdropColor,
},
{
bottom: topOverlayBottomBoundary,
left: verticalOverlayLeftBoundary,
right: verticalOverlayRightBoundary,
[start]: verticalOverlayLeftBoundary,
[end]: verticalOverlayRightBoundary,
backgroundColor: props.backdropColor,
},
].map((style, index) => (
Expand Down