Closed fw-bot closed 2 months ago
@dhrp-odoo @hokolomopo cherrypicking of pull request odoo/o-spreadsheet#4666 failed.
stdout:
Auto-merging src/components/helpers/position_hook.ts
CONFLICT (content): Merge conflict in src/components/helpers/position_hook.ts
Auto-merging src/components/popover/popover.ts
CONFLICT (content): Merge conflict in src/components/popover/popover.ts
stderr:
13:17:44.178323 git.c:463 trace: built-in: git cherry-pick 260c6006ac97307be2c70b6ead21080104c8a18f --strategy ort
error: could not apply 260c6006a... [IMP] position_hook: include width and height in `useSpreadsheetRect`
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:
Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).
In the former case, you may want to edit this PR message as well.
:warning: after resolving this conflict, you will need to merge it via @robodoo.
More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
@robodoo r+
Description:
When typing
=S
in the composer, the composer assistant will open. If there wasn't enough space on right (default 300px width), this would break the layout. This PR addresses the issue by adding a width check for the composer assistant. If the width condition is met, the styleright: 0px
is applied to prevent the layout from breaking.Task: : 4037213
review checklist
Forward-Port-Of: odoo/o-spreadsheet#4666