Skip to content
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.

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

fix(popup): 增加禁止 page 滚动的例子 #2803

Closed
wants to merge 2 commits into from

Conversation

oasis-cloud
Copy link
Collaborator

@oasis-cloud oasis-cloud commented Nov 27, 2024

🤔 这个变动的性质是?

  • 新特性提交
  • 日常 bug 修复
  • 站点、文档改进
  • 演示代码改进
  • 组件样式/交互改进
  • TypeScript 定义更新
  • 包体积优化
  • 性能优化
  • 功能增强
  • 国际化改进
  • 重构
  • 代码风格优化
  • 测试用例
  • 分支合并
  • 其他改动(是关于什么的改动?)

🔗 相关 Issue

💡 需求背景和解决方案

☑️ 请求合并前的自查清单

⚠️ 请自检并全部勾选全部选项⚠️

  • 文档已补充或无须补充
  • 代码演示已提供或无须提供
  • TypeScript 定义已补充或无须补充
  • fork仓库代码是否为最新避免文件冲突
  • Files changed 没有 package.json lock 等无关文件

Summary by CodeRabbit

  • 新功能

    • Popup 组件中添加了 onOpen 事件处理程序,以改善在特定环境(如微信小程序)中的弹出行为,防止页面滚动。
  • 文档

    • 更新了 Popup 组件的文档,增加了关于弹出时处理滚动行为的说明,强调了 lockScroll 属性和 catchMove 方法的使用。

Copy link

coderabbitai bot commented Nov 27, 2024

Walkthrough

此次更改为 Popup 组件添加了新的 onOpen 事件处理程序,该处理程序在弹出窗口打开时触发,并检查当前环境是否为微信小程序。如果条件满足,则调用 wx.setPageStyle 设置页面样式以防止滚动。文档也进行了更新,增加了关于弹出窗口打开时处理滚动行为的说明,强调了 lockScroll 属性和 catchMove 方法的使用。

Changes

文件路径 更改摘要
src/packages/popup/demos/taro/demo8.tsx 添加了 onOpen 事件处理程序以处理弹出窗口打开时的样式设置,防止页面滚动。
src/packages/popup/doc.taro.md 更新了文档,增加了关于弹出窗口打开时处理滚动行为的说明,强调了 lockScroll 属性和 catchMove 方法的使用。

Possibly related PRs

Suggested labels

2.x

兔子欢跳庆新生,
弹窗功能更添情。
微信小程序来相伴,
滚动样式不再烦。
代码更新喜洋洋,
文档清晰更辉煌。 🐇✨


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 62090c3 and fe3b54c.

📒 Files selected for processing (1)
  • src/packages/popup/demos/taro/demo8.tsx (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • src/packages/popup/demos/taro/demo8.tsx

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@github-actions github-actions bot added the 2.x label Nov 27, 2024
Copy link

codecov bot commented Nov 27, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 84.07%. Comparing base (3fb4d5f) to head (fe3b54c).
Report is 4 commits behind head on next.

Additional details and impacted files
@@           Coverage Diff           @@
##             next    #2803   +/-   ##
=======================================
  Coverage   84.07%   84.07%           
=======================================
  Files         217      217           
  Lines       17830    17830           
  Branches     2609     2609           
=======================================
  Hits        14991    14991           
  Misses       2834     2834           
  Partials        5        5           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 2

🧹 Outside diff range and nitpick comments (2)
src/packages/popup/demos/taro/demo8.tsx (1)

16-28: 建议提取环境检查逻辑

为了提高代码的可维护性和复用性,建议将微信环境检查和样式设置逻辑提取到独立的 hook 中。

建议创建一个自定义 hook:

const usePreventScroll = () => {
  const isWeapp = getEnv().toLowerCase() === 'weapp'

  const preventScroll = () => {
    if (!isWeapp) return
    
    wx.setPageStyle({
      style: { overflow: 'hidden' },
      fail: (error) => {
        console.error('设置页面样式失败:', error)
      }
    })
  }

  const restoreScroll = () => {
    if (!isWeapp) return
    
    wx.setPageStyle({
      style: { overflow: 'visible' },
      fail: (error) => {
        console.error('恢复页面样式失败:', error)
      }
    })
  }

  return { preventScroll, restoreScroll }
}

然后在组件中使用:

 const Demo8 = () => {
   const [scrollPenetration, setScrollPenetration] = useState(false)
+  const { preventScroll, restoreScroll } = usePreventScroll()

   return (
     <Popup
       visible={scrollPenetration}
       position="bottom"
       lockScroll
-      onOpen={() => {
-        Taro.getEnv().toLowerCase() === 'weapp' &&
-          wx.setPageStyle({
-            complete: console.log,
-            style: { overflow: 'hidden' },
-          })
-      }}
+      onOpen={preventScroll}
+      onClose={restoreScroll}
     >
🧰 Tools
🪛 GitHub Check: build

[failure] 23-23:
Cannot find name 'wx'.

src/packages/popup/doc.taro.md (1)

83-84: 文档补充合理且有价值!

新增的说明很好地解释了如何在不同环境下处理页面滚动问题。建议补充一个具体的代码示例,以便开发者更好地理解实现方式。

建议在文档中添加以下示例代码:

const handleOpen = () => {
  if (process.env.TARO_ENV === 'weapp') {
    wx.setPageStyle({
      style: {
        overflow: 'hidden',
      },
    })
  }
}
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 3fb4d5f and 62090c3.

📒 Files selected for processing (2)
  • src/packages/popup/demos/taro/demo8.tsx (1 hunks)
  • src/packages/popup/doc.taro.md (1 hunks)
🧰 Additional context used
🪛 GitHub Check: build
src/packages/popup/demos/taro/demo8.tsx

[failure] 23-23:
Cannot find name 'wx'.

Comment on lines +21 to +22
// @ts-ignore
Taro.getEnv().toLowerCase() === 'weapp' &&
Copy link

Choose a reason for hiding this comment

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

⚠️ Potential issue

需要添加微信小程序的类型定义

建议不要使用 @ts-ignore 来绕过类型检查。相反,应该正确引入微信小程序的类型定义。

建议添加以下类型定义:

+import { getEnv } from '@tarojs/taro'
+import { wx } from '@tarojs/taro/types/wx/index'

然后移除 @ts-ignore 注释并使用导入的类型:

-        // @ts-ignore
-        Taro.getEnv().toLowerCase() === 'weapp' &&
+        getEnv().toLowerCase() === 'weapp' &&

Committable suggestion skipped: line range outside the PR's diff.

Comment on lines +23 to +26
wx.setPageStyle({
complete: console.log,
style: { overflow: 'hidden' },
})
Copy link

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

优化错误处理和清理逻辑

当前实现存在以下问题:

  1. 没有处理 setPageStyle 可能的失败情况
  2. 在弹窗关闭时没有恢复页面样式
  3. 在生产环境中使用了 console.log

建议按照以下方式优化实现:

 <Popup
   visible={scrollPenetration}
   position="bottom"
   lockScroll
   onOpen={() => {
-    Taro.getEnv().toLowerCase() === 'weapp' &&
-      wx.setPageStyle({
-        complete: console.log,
-        style: { overflow: 'hidden' },
-      })
+    if (getEnv().toLowerCase() === 'weapp') {
+      wx.setPageStyle({
+        style: { overflow: 'hidden' },
+        success: () => {
+          console.debug('页面样式设置成功')
+        },
+        fail: (error) => {
+          console.error('设置页面样式失败:', error)
+        }
+      })
+    }
   }}
+  onClose={() => {
+    if (getEnv().toLowerCase() === 'weapp') {
+      wx.setPageStyle({
+        style: { overflow: 'visible' },
+        fail: (error) => {
+          console.error('恢复页面样式失败:', error)
+        }
+      })
+    }
+  }}
 >
📝 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
wx.setPageStyle({
complete: console.log,
style: { overflow: 'hidden' },
})
<Popup
visible={scrollPenetration}
position="bottom"
lockScroll
onOpen={() => {
if (getEnv().toLowerCase() === 'weapp') {
wx.setPageStyle({
style: { overflow: 'hidden' },
success: () => {
console.debug('页面样式设置成功')
},
fail: (error) => {
console.error('设置页面样式失败:', error)
}
})
}
}}
onClose={() => {
if (getEnv().toLowerCase() === 'weapp') {
wx.setPageStyle({
style: { overflow: 'visible' },
fail: (error) => {
console.error('恢复页面样式失败:', error)
}
})
}
}}
>
🧰 Tools
🪛 GitHub Check: build

[failure] 23-23:
Cannot find name 'wx'.

@oasis-cloud oasis-cloud marked this pull request as draft November 28, 2024 08:53
@oasis-cloud oasis-cloud closed this Dec 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant