feat: merge branch osd into develop
#8173
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…um-standalone" (google#7520) This reverts commit b22656b.
* minor: update return type of widgetCreate_ Signed-off-by: Akanksha Kushwaha <cmakanksha@gmail.com> * minor: remove 'as HTMLInputElement' cast Signed-off-by: Akanksha Kushwaha <cmakanksha@gmail.com> * minor: update return type and cast Signed-off-by: Akanksha Kushwaha <cmakanksha@gmail.com> --------- Signed-off-by: Akanksha Kushwaha <cmakanksha@gmail.com>
fix: move delete keyboard shortcut in-progress gesture check to precondition google#6274
* removed internal from horizontal and vertical flyout * feat : made the method isDragTowardWorkspace non private * feat : made the method isDragTowardWorkspace non private --------- Co-authored-by: Ramya Non-IU <ramyaram2092@outlook.com>
* fix: Paste block in viewport / near cursor * Fix: formatting fix with prettier * fix import path for Coordinate * fix import path for coordinate * paste so that the block's center is at the viewport center
* Removed underscore from isLabel_ in flyout_button.ts * chore: rename isLabel_ to isFlyoutLabel in flyout_button.ts * fix: format --------- Co-authored-by: sayali-kandarkar <skandark@andrew.cmu.edu>
…oogle#7191 (google#7517) * addition of the .gitattributes file * Update .gitattributes
…oogle#7522 (google#7537) * google#7522 edits -- collaborated with Hinal Patel, Swedhaa Sri Elango, & Yuchi Hsieh * google#7522 edits: collaborated with Hinal Patel, Swedhaa Sri Elango, & Yuchi Hsieh * fix: non-nullable check for block variable and removed ! in layout_ google#7522 * fix: non-nullable check for block variable and removed ! in layout_
…oogle#7536) * Fix: 7523 - non-nullable check for block variable and removed ! * Fix: non nullable check for block variable * fix: fixed styling issue * fix: updated block variable nullable condition * Updated nullable condition for block variable
* fix: pasting with nothing selected * fix: import * chore: format
This reverts commit c37f4b8.
| @@ -0,0 +1 @@ | |||
| * text=auto | |||
There was a problem hiding this comment.
Should this be included?
There was a problem hiding this comment.
Yes, this is the fix for #7191
rachel-fenichel
approved these changes
May 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The basics
The details
Resolves
Fixes #6848 & many others already marked closed
Proposed Changes
osdbranch intodevelopgetRelativeToSurfaceXYto theIMovableinterface. However, doing so would have been have been a breaking change since this interface is public. Additionally, it seems no longer necessary as this interface appears to be totally unused now within Blockly. The precondition function forcopychecks that the selected objectisDraggable10000 , and theIDraggableinterface includesgetRelativeToSurfaceXY. Therefore, no changes to any interfaces were required.containsinstead of doing manual coordinate math.copyCoordswhen they were within the viewport. Instead, I chose not to pass any coordinates and let the paster choose the location. This has the same effect in practice but may be better in the future depending on the paster.copyCoordsmight be null, and I don't return early if that's the case, I just let the paster handle the location as before. In practice, I don't think they ever will be null with the current set of copyable objects, but sincegetRelativeToSurfaceXYis only required by theIDraggableinterface and not theICopyableinterface, this seemed prudent.Reason for Changes
Merging in fixes from contributors.
Test Coverage
I have hand-checked each of the commits to ensure they are still relevant & intended. Aside from the two mentioned above, these changes are all relevant, intended, plus straightforward. The paste behavior has been checked carefully, including looking for symptoms of #8099, after reapplying #7521. Tested both block & workspace comment pasting within viewport & after scrolling.
Documentation
Additional Information
As an aside, it's interesting to note that the
preconditionFnforcopyrequires that the selected item be bothcopyableanddraggable. ThepreconditionFnforcutdoes not check that the selected item bedraggable, but the actualcallbackdoes return false if the object isn'tdraggable. Fixing that seemed outside the scope of this PR though.This PR should be merged, not squashed