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

enhance: context menu on custom reports page #3776

Open
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

UnderKoen
Copy link
Member

No description provided.

@actual-github-bot actual-github-bot bot changed the title enhance: context menu on custom reports page [WIP] enhance: context menu on custom reports page Nov 3, 2024
Copy link

netlify bot commented Nov 3, 2024

Deploy Preview for actualbudget ready!

Name Link
🔨 Latest commit 41d9b14
🔍 Latest deploy log https://app.netlify.com/sites/actualbudget/deploys/6733afe9caf0bf00086145c9
😎 Deploy Preview https://deploy-preview-3776.demo.actualbudget.org
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link
Contributor

github-actions bot commented Nov 3, 2024

Bundle Stats — desktop-client

Hey there, this message comes from a GitHub action that helps you and reviewers to understand how these changes affect the size of this project's bundle.

As this PR is updated, I'll keep you updated on how the bundle size is impacted.

Total

Files count Total bundle size % Changed
9 5.35 MB → 5.36 MB (+1.17 kB) +0.02%
Changeset
File Δ Size
node_modules/clsx/dist/clsx.js 🆕 +509 B 0 B → 509 B
node_modules/clsx/dist/clsx.js?commonjs-module 🆕 +27 B 0 B → 27 B
src/components/reports/ReportCard.tsx 📈 +1.08 kB (+32.65%) 3.29 kB → 4.37 kB
node_modules/react-grid-layout/build/ReactGridLayout.js 📉 -1 B (-0.00%) 24.96 kB → 24.96 kB
node_modules/react-grid-layout/build/GridItem.js 📉 -1 B (-0.00%) 21.49 kB → 21.49 kB
node_modules/react-grid-layout/build/components/WidthProvider.js 📉 -1 B (-0.02%) 5.22 kB → 5.22 kB
node_modules/clsx/dist/clsx.mjs 🔥 -368 B (-100%) 368 B → 0 B
node_modules/clsx/dist/clsx.mjs?commonjs-proxy 🔥 -64 B (-100%) 64 B → 0 B
View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

Asset File Size % Changed
static/js/ReportRouter.js 1.49 MB → 1.49 MB (+1.01 kB) +0.07%
static/js/index.js 3.37 MB → 3.37 MB (+168 B) +0.00%

Smaller

No assets were smaller

Unchanged

Asset File Size % Changed
static/js/resize-observer.js 18.37 kB 0%
static/js/BackgroundImage.js 122.29 kB 0%
static/js/workbox-window.prod.es5.js 5.69 kB 0%
static/js/indexeddb-main-thread-worker-e59fee74.js 13.5 kB 0%
static/js/narrow.js 82.76 kB 0%
static/js/AppliedFilters.js 21.3 kB 0%
static/js/wide.js 242.64 kB 0%

Copy link
Contributor

github-actions bot commented Nov 3, 2024

Bundle Stats — loot-core

Hey there, this message comes from a GitHub action that helps you and reviewers to understand how these changes affect the size of this project's bundle.

As this PR is updated, I'll keep you updated on how the bundle size is impacted.

Total

Files count Total bundle size % Changed
1 1.27 MB 0%

Changeset

No files were changed

View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

No assets were bigger

Smaller

No assets were smaller

Unchanged

Asset File Size % Changed
kcab.worker.js 1.27 MB 0%

@UnderKoen UnderKoen changed the title [WIP] enhance: context menu on custom reports page enhance: context menu on custom reports page Nov 3, 2024
Copy link
Contributor

coderabbitai bot commented Nov 3, 2024

Walkthrough

The pull request introduces modifications to the ReportCard component located in ReportCard.tsx. A new import for useFeatureFlag is added to facilitate the use of feature flags within the component. The Layout function is updated to include new state variables: crossOffset and offset, both initialized to 0, and menuOpen, which can hold values of null, 'context', or 'button'. The menuOpen state manages the visibility of context menus.

Additionally, the return statement of the Layout function is modified to incorporate an onContextMenu event handler on the main View. This handler checks for the context menu feature flag, prevents the default context menu from appearing, sets the menuOpen state, and calculates offsets based on the mouse event. The rendering logic for the MenuButton is also adjusted to reset offsets when pressed and update the menuOpen state accordingly. The Popover component's properties are conditionally set based on the context menu state, enhancing the component's functionality with improved context menu support.

Possibly related PRs

Suggested reviewers

  • RubenOlsen
  • youngcw
  • jfdoming

Warning

There were issues while running some tools. Please review the errors and either fix the tool’s configuration or disable the tool if it’s a critical failure.

🔧 eslint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

packages/desktop-client/src/components/reports/ReportCard.tsx

Oops! Something went wrong! :(

ESLint: 8.57.1

ESLint couldn't find the plugin "eslint-plugin-eslint-plugin".

(The package "eslint-plugin-eslint-plugin" was not found when loaded as a Node module from the directory "/packages/eslint-plugin-actual".)

It's likely that the plugin isn't installed correctly. Try reinstalling by running the following:

npm install eslint-plugin-eslint-plugin@latest --save-dev

The plugin "eslint-plugin-eslint-plugin" was referenced from the config file in "packages/eslint-plugin-actual/.eslintrc.js".

If you still can't figure out the problem, please stop by https://eslint.org/chat/help to chat with the team.


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.

Copy link
Contributor

@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: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between e078ed2 and 2df910e.

⛔ Files ignored due to path filters (1)
  • upcoming-release-notes/3776.md is excluded by !**/*.md
📒 Files selected for processing (1)
  • packages/desktop-client/src/components/reports/ReportCard.tsx (3 hunks)
🔇 Additional comments (6)
packages/desktop-client/src/components/reports/ReportCard.tsx (6)

11-11: Importing useFeatureFlag is correctly added

The import statement is necessary for the feature flag usage in the component.


129-134: State variables initialized for context menu functionality

The addition of viewRef, menuOpen, crossOffset, offset, and contextMenusEnabled sets up the necessary state and references for managing the context menu.


135-135: isContextMenu derived state implemented correctly

The isContextMenu variable accurately determines when the context menu is active.


139-147: Context menu event handler correctly implemented

The onContextMenu handler appropriately activates the context menu when the feature flag is enabled and calculates the positioning offsets based on the mouse event.


176-181: Resetting offsets and updating menu state on button press

The MenuButton correctly resets crossOffset and offset and updates menuOpen to 'button' when pressed.


187-193: Popover component configured appropriately for different menu triggers

The Popover component uses the correct triggerRef, placement, and offsets based on whether the context menu or button menu is active.

@youngcw
Copy link
Member

youngcw commented Nov 11, 2024

This will probably need gated by the reports dashboard feature flag since it is using the dashboard features in the menu.

Copy link
Contributor

@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 (1)
packages/desktop-client/src/components/reports/ReportCard.tsx (1)

171-179: Reconsider offset reset in MenuButton handler.

The MenuButton handler resets both offsets to 0, which might cause the menu to appear in an unexpected position when toggling between context menu and button menu states. Consider preserving the last known good position or calculating appropriate offsets based on the button's position.

 <MenuButton
   ref={triggerRef}
   onPress={() => {
-    setCrossOffset(0);
-    setOffset(0);
+    const rect = triggerRef.current?.getBoundingClientRect();
+    if (rect) {
+      setCrossOffset(rect.width);
+      setOffset(0);
+    }
     setMenuOpen('button');
   }}
 />
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 2df910e and 41d9b14.

📒 Files selected for processing (1)
  • packages/desktop-client/src/components/reports/ReportCard.tsx (3 hunks)
🧰 Additional context used
📓 Learnings (1)
packages/desktop-client/src/components/reports/ReportCard.tsx (1)
Learnt from: UnderKoen
PR: actualbudget/actual#3776
File: packages/desktop-client/src/components/reports/ReportCard.tsx:165-167
Timestamp: 2024-11-10T16:45:31.225Z
Learning: In `ReportCard.tsx`, the usage of `className=[menuOpen ? undefined : 'hover-visible', NON_DRAGGABLE_AREA_CLASS_NAME].join(' ')` in the `Layout` function is intentional and does not cause styling issues in the codebase.
🔇 Additional comments (1)
packages/desktop-client/src/components/reports/ReportCard.tsx (1)

123-126: LGTM! Well-structured state management.

The state management is well-implemented with:

  • Proper TypeScript union type for menu states
  • Clear separation of positioning states
  • Appropriate use of refs for DOM references

Comment on lines +136 to +143
onContextMenu={e => {
if (!contextMenusEnabled) return;
e.preventDefault();
setMenuOpen('context');
const rect = e.currentTarget.getBoundingClientRect();
setCrossOffset(e.clientX - rect.left);
setOffset(e.clientY - rect.bottom);
}}
Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Enhance context menu handling robustness.

Consider these improvements to the context menu implementation:

  1. Add a check for menuItems existence before showing the context menu
  2. Prevent context menu during editing mode to avoid conflicts
  3. Add viewport boundary checks for menu positioning
 onContextMenu={e => {
-  if (!contextMenusEnabled) return;
+  if (!contextMenusEnabled || !menuItems || isEditing) return;
   e.preventDefault();
   setMenuOpen('context');
   const rect = e.currentTarget.getBoundingClientRect();
-  setCrossOffset(e.clientX - rect.left);
-  setOffset(e.clientY - rect.bottom);
+  // Ensure menu stays within viewport
+  const viewportWidth = window.innerWidth;
+  const viewportHeight = window.innerHeight;
+  const crossOff = e.clientX - rect.left;
+  const off = e.clientY - rect.bottom;
+  setCrossOffset(Math.min(crossOff, viewportWidth - 200)); // 200 is approximate menu width
+  setOffset(Math.min(off, viewportHeight - 300)); // 300 is approximate menu height
 }}

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

const [menuOpen, setMenuOpen] = useState<null | 'context' | 'button'>(null);
const [crossOffset, setCrossOffset] = useState(0);
const [offset, setOffset] = useState(0);
const reportBudgetEnabled = useFeatureFlag('reportBudget');
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think report budget is needed here, did you mean the dashboards feature flag?

authors: [UnderKoen]
---

Add context menu's to custom reports dashboard
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Add context menu's to custom reports dashboard
Add context menus to custom reports dashboard

@matt-fidd matt-fidd self-assigned this Nov 19, 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.

3 participants