@@ -47,6 +47,7 @@ const DIAGRAM_FLOATING_TOOLBAR_CONTAINER_CLASS = DIAGRAM_CLASS + '-floating-tool
4747const DIAGRAM_PROPERTIES_PANEL_TOOLBAR_CONTAINER_CLASS = DIAGRAM_CLASS + '-properties-panel-toolbar-container' ;
4848const DIAGRAM_LOADING_INDICATOR_CLASS = DIAGRAM_CLASS + '-loading-indicator' ;
4949const DIAGRAM_FLOATING_PANEL_OFFSET = 12 ;
50+ const DIAGRAM_PROPERTIES_PANEL_NS_OFFSET = 16 ;
5051
5152const DIAGRAM_DEFAULT_UNIT = 'in' ;
5253const DIAGRAM_DEFAULT_ZOOMLEVEL = 1 ;
@@ -474,21 +475,22 @@ class Diagram extends Widget {
474475 }
475476 _updatePropertiesToolbarPosition ( $container , $parent , isServerSide ) {
476477 if ( isServerSide ) return ;
477-
478+ const offset = this . option ( 'useNativeScrolling' ) ? DIAGRAM_PROPERTIES_PANEL_NS_OFFSET : DIAGRAM_FLOATING_PANEL_OFFSET ;
478479 positionUtils . setup ( $container , {
479480 my : 'right bottom' ,
480481 at : 'right bottom' ,
481482 of : $parent ,
482- offset : '-' + DIAGRAM_FLOATING_PANEL_OFFSET + ' -' + DIAGRAM_FLOATING_PANEL_OFFSET
483+ offset : `- ${ offset } px - ${ offset } px`
483484 } ) ;
484485 }
485486 _renderPropertiesPanel ( $parent ) {
486487 const isServerSide = ! hasWindow ( ) ;
487488 const $propertiesPanel = $ ( '<div>' )
488489 . appendTo ( $parent ) ;
489490
490- const offsetX = DIAGRAM_FLOATING_PANEL_OFFSET ;
491- const offsetY = 2 * DIAGRAM_FLOATING_PANEL_OFFSET + ( ! isServerSide ? getOuterHeight ( this . _propertiesToolbar . $element ( ) ) : 0 ) ;
491+ const offset = this . option ( 'useNativeScrolling' ) ? DIAGRAM_PROPERTIES_PANEL_NS_OFFSET : DIAGRAM_FLOATING_PANEL_OFFSET ;
492+ const offsetX = offset ;
493+ const offsetY = 2 * offset + ( ! isServerSide ? getOuterHeight ( this . _propertiesToolbar . $element ( ) ) : 0 ) ;
492494 this . _propertiesPanel = this . _createComponent ( $propertiesPanel , DiagramPropertiesPanel , {
493495 isMobileView : this . isMobileScreenSize ( ) ,
494496 isVisible : this . _isPropertiesPanelVisible ( ) ,
0 commit comments