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 calendar interaction when editing reports dashboard #4336

Merged
merged 4 commits into from
Feb 11, 2025

Conversation

ChickenSaysBak
Copy link
Contributor

Bug

As of v25.2.1 and before, the buttons (day boxes) on calendar reports remain clickable when when editing the reports dashboard. This presents a problem where the calendar is invertedly clicked on when drag-n-dropping to move it.

How to reproduce

  1. Add calendar report.
  2. Edit dashboard.
  3. Click from anywhere in the middle of the calendar (not the edges) and drag the card to a new position.
  4. Upon letting go, you will be taken to the calendar report when you should have stayed at the dashboard for further editing.

Proposed solution

This code solves the issue by sending the calendar day buttons to the background while editing the dashboard. I originally tried just disabling the buttons, but when hovering, the cursor is set to default rather than move which it should be when dragging the card.

Copy link

netlify bot commented Feb 8, 2025

Deploy Preview for actualbudget ready!

Name Link
🔨 Latest commit 5a8a401
🔍 Latest deploy log https://app.netlify.com/sites/actualbudget/deploys/67aa88494cad580008282dbd
😎 Deploy Preview https://deploy-preview-4336.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.

@ChickenSaysBak ChickenSaysBak changed the title Fix calendar interaction when editing reports dashboard [WIP] Fix calendar interaction when editing reports dashboard Feb 8, 2025
Copy link
Contributor

github-actions bot commented Feb 8, 2025

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
16 6.83 MB → 6.84 MB (+2.4 kB) +0.03%
Changeset
File Δ Size
node_modules/clsx/dist/clsx.mjs 🆕 +368 B 0 B → 368 B
node_modules/clsx/dist/clsx.mjs?commonjs-proxy 🆕 +64 B 0 B → 64 B
locale/pt-BR.json 📈 +2.4 kB (+2.30%) 104.03 kB → 106.43 kB
src/components/reports/graphs/CalendarGraph.tsx 📈 +54 B (+0.62%) 8.49 kB → 8.54 kB
src/components/reports/reports/CalendarCard.tsx 📈 +55 B (+0.36%) 15.02 kB → 15.08 kB
node_modules/react-grid-layout/build/components/WidthProvider.js 📈 +1 B (+0.02%) 5.22 kB → 5.22 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/ReactGridLayout.js 📈 +1 B (+0.00%) 24.96 kB → 24.96 kB
node_modules/clsx/dist/clsx.js 🔥 -509 B (-100%) 509 B → 0 B
node_modules/clsx/dist/clsx.js?commonjs-module 🔥 -27 B (-100%) 27 B → 0 B
View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

Asset File Size % Changed
static/js/pt-BR.js 104.03 kB → 106.43 kB (+2.4 kB) +2.30%
static/js/ReportRouter.js 1.59 MB → 1.59 MB (+176 B) +0.01%

Smaller

Asset File Size % Changed
static/js/index.js 4.29 MB → 4.29 MB (-168 B) -0.00%

Unchanged

Asset File Size % Changed
static/js/resize-observer.js 18.37 kB 0%
static/js/en-GB.js 99.33 kB 0%
static/js/en.js 99.43 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/de.js 110.85 kB 0%
static/js/uk.js 111.11 kB 0%
static/js/nl.js 94.83 kB 0%
static/js/useAccountPreviewTransactions.js 1.69 kB 0%
static/js/BackgroundImage.js 122.29 kB 0%
static/js/AppliedFilters.js 10.52 kB 0%
static/js/narrow.js 84.94 kB 0%
static/js/wide.js 102.8 kB 0%

Copy link
Contributor

github-actions bot commented Feb 8, 2025

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.33 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.33 MB 0%

@ChickenSaysBak ChickenSaysBak changed the title [WIP] Fix calendar interaction when editing reports dashboard Fix calendar interaction when editing reports dashboard Feb 8, 2025
@ChickenSaysBak ChickenSaysBak marked this pull request as ready for review February 8, 2025 02:13
Copy link
Contributor

coderabbitai bot commented Feb 8, 2025

Walkthrough

The changes introduce an optional boolean property called isEditing to the CalendarGraphProps type in the CalendarGraph component. When isEditing is true, the component adjusts its zIndex style to -1, which prevents interactions with calendar buttons during editing. In addition, the isEditing prop is added to the CalendarCard component and its inner component, CalendarCardInner, to propagate this state across the related components. The modifications include updates to prop declarations and function signatures in both CalendarGraph.tsx and CalendarCard.tsx, ensuring that the editing state is consistently managed and reflected in the UI without altering the overall structural or logical flow of the components.

Suggested labels

:sparkles: Merged

Suggested reviewers

  • joel-jeremy
  • matt-fidd

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 5f1fadb and cba99a5.

⛔ Files ignored due to path filters (1)
  • upcoming-release-notes/4336.md is excluded by !**/*.md
📒 Files selected for processing (2)
  • packages/desktop-client/src/components/reports/graphs/CalendarGraph.tsx (2 hunks)
  • packages/desktop-client/src/components/reports/reports/CalendarCard.tsx (4 hunks)
🔇 Additional comments (5)
packages/desktop-client/src/components/reports/graphs/CalendarGraph.tsx (2)

24-36: LGTM! Clean type definition update.

The isEditing optional boolean prop is correctly added to the CalendarGraphProps type.


94-104: LGTM! Effective solution for preventing calendar interaction.

The zIndex: -1 style effectively prevents interaction with calendar buttons during editing while maintaining the desired move cursor for drag-and-drop operations.

packages/desktop-client/src/components/reports/reports/CalendarCard.tsx (3)

318-332: LGTM! Clean type definition update.

The isEditing optional boolean prop is correctly added to the CalendarCardInnerProps type.


333-341: LGTM! Proper prop destructuring.

The isEditing prop is correctly destructured from the component props.


515-520: LGTM! Proper prop forwarding.

The isEditing prop is correctly forwarded to the CalendarGraph component.


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 generate docstrings to generate docstrings for this PR. (Beta)
  • @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
Member

@youngcw youngcw left a comment

Choose a reason for hiding this comment

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

Thanks!

@youngcw youngcw merged commit c883e71 into actualbudget:master Feb 11, 2025
21 checks passed
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.

2 participants