Skip to content
Merged
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions src/utils/get-rect-by-taro.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { createSelectorQuery } from '@tarojs/taro'
import { getRect, inBrowser } from './use-client-rect'
import { rn } from './platform-taro'

export interface Rect {
dataset: Record<string, any>
Expand Down Expand Up @@ -28,6 +29,25 @@ export const getRectByTaro = async (element: any): Promise<Rect> => {
if (inBrowser) {
return Promise.resolve(getRect(element))
}
if (rn()) {
return new Promise((resolve) => {
element.measure(
(
xPos: number,
yPos: number,
measureWidth: number,
measureHeight: number,
pageX: number,
pageY: number
) => {
const rect = makeRect(measureWidth, measureHeight)
rect.left = pageX
rect.top = pageY
resolve(rect)
}
)
})
Comment on lines +32 to +49

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

新增的 React Native 逻辑使用了 measure 方法来获取元素的布局信息,这是 React Native 中的常见做法。不过,参数命名(如 xPos, yPos)可以更具描述性,以提高代码的可读性。

-            xPos: number,
-            yPos: number,
+            xPosition: number,
+            yPosition: number,
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
if (rn()) {
return new Promise((resolve) => {
element.measure(
(
xPos: number,
yPos: number,
measureWidth: number,
measureHeight: number,
pageX: number,
pageY: number
) => {
const rect = makeRect(measureWidth, measureHeight)
rect.left = pageX
rect.top = pageY
resolve(rect)
}
)
})
if (rn()) {
return new Promise((resolve) => {
element.measure(
(
xPosition: number,
yPosition: number,
measureWidth: number,
measureHeight: number,
pageX: number,
pageY: number
) => {
const rect = makeRect(measureWidth, measureHeight)
rect.left = pageX
rect.top = pageY
resolve(rect)
}
)
})

}
// 小程序下的逻辑
return new Promise((resolve, reject) => {
createSelectorQuery()
Expand Down