mirror of
https://github.com/google/blockly.git
synced 2026-01-10 10:27:08 +01:00
Simplify Closure-sourced code for menus (#3880)
* Remove cargo-culted bloat from CSS The `goog-menuitem-icon` and `goog-menuitem-noicon` classes are not present in Blockly. Blockly doesn’t support the CSS compiler, so #noflip has no effect. Shorten uncompressible warning string. Also remove the “Copied from Closure” notes. These were intended so that the CSS could be easily updated as the Closure Library evolved. We are no longer linked to the Closure Library. * Fix bug (in prod) where menu highlighting is lost Previously, open playground. Right-click on workspace. Mouse-over “Add comment” (it highlights). Mouse over “Download screenshot” (disabled option). Mouse over “Add comment” (highlighting is lost). Also remove `canHighlightItem` helper function. In theory this helps abstract the concept of non-highlightable options. But in practice it was only called in one of the several places that it should have been. This was a false abstraction. * Add support for Space/PgUp/PgDn/Home/End to menus * Eliminate calls to clearHighlighted The JSDoc for `setHighlightedIndex` specifically states, “If another item was previously highlighted, it is un-highlighted.” This is not what was implemented, but it should be. This commit adds the un-highlighting, and removes all the calls previously required to correct this bug. * Stop wrapping at top or bottom of menu. Real OS menus don’t wrap when one cursors off the top or bottom. Also, replace the overly complicated helper function with a simple 1/-1 step value. * Remove unused menu code * Simplify menu roles Remove unneeded sets to RTL on Menu (only MenuItem cares). * Fix lack of disposal for context menus. Context menus only disposed properly when an option was clicked. If they were dismissed by clicking outside the menu there was no disposal. This might result in a memory leak. Also un-extract (inject?) several now trivial functions. * Remove Component dependency from Menu & MenuItem Component is now only used by the category tree. * Remove unused functions in Component These were used by Menu/MenuItem. * Fix dependencies. * Record highlighted menu item by object, not index Less code, simpler. * Rename CSS classes goog-menu* to blocklyMenu* Old classes remain in DOM and are deprecated so that any custom CSS will continue to function. * Remove unused focus tracker in tree. * Add support for space/enter to toggle tree cats * Delete unsettable .isUserCollapsible_ from tree * Change visibility tags throughout menus. The previous tags were inherited from Closure and don’t reflect current usage in the Blockly codebase. The core/components/tree files are non-compliant in this regard, but I’m not going to update them since they need to be replaced and there’s no need to create an interim API change. * Remove property on DOM element linking to JS obj Performance is slower (O(n) rather than (O(1)), but ’n’ is the number of entries on the menu, so shouldn’t be more than a dozen or so. * Fixes a compile error (node != element) Usually we avoid parentElement in Blockly. That’s because it has very spotty behaviour with SVG. But in this case we are in pure HTML.
This commit is contained in:
Neil Fraser
GitHub
320
core/css.js
320
core/css.js
@@ -74,13 +74,13 @@ Blockly.Css.inject = function(hasCss, pathToMedia) {
|
||||
|
||||
/**
|
||||
* Set the cursor to be displayed when over something draggable.
|
||||
* See See https://github.com/google/blockly/issues/981 for context.
|
||||
* See https://github.com/google/blockly/issues/981 for context.
|
||||
* @param {*} _cursor Enum.
|
||||
* @deprecated April 2017.
|
||||
*/
|
||||
Blockly.Css.setCursor = function(_cursor) {
|
||||
console.warn('Deprecated call to Blockly.Css.setCursor. ' +
|
||||
'See https://github.com/google/blockly/issues/981 for context');
|
||||
'See issue #981 for context');
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -150,8 +150,7 @@ Blockly.Css.CONTENT = [
|
||||
'box-shadow: 4px 4px 20px 1px rgba(0,0,0,.15);',
|
||||
'color: #000;',
|
||||
'display: none;',
|
||||
'font-family: sans-serif;',
|
||||
'font-size: 9pt;',
|
||||
'font: 9pt sans-serif;',
|
||||
'opacity: .9;',
|
||||
'padding: 2px;',
|
||||
'position: absolute;',
|
||||
@@ -169,11 +168,11 @@ Blockly.Css.CONTENT = [
|
||||
'background-color: #fff;',
|
||||
'border-radius: 2px;',
|
||||
'padding: 4px;',
|
||||
'box-shadow: 0px 0px 3px 1px rgba(0,0,0,.3);',
|
||||
'box-shadow: 0 0 3px 1px rgba(0,0,0,.3);',
|
||||
'}',
|
||||
|
||||
'.blocklyDropDownDiv.focused {',
|
||||
'box-shadow: 0px 0px 6px 1px rgba(0,0,0,.3);',
|
||||
'.blocklyDropDownDiv.blocklyFocused {',
|
||||
'box-shadow: 0 0 6px 1px rgba(0,0,0,.3);',
|
||||
'}',
|
||||
|
||||
'.blocklyDropDownContent {',
|
||||
@@ -309,7 +308,7 @@ Blockly.Css.CONTENT = [
|
||||
'.blocklyInsertionMarker>.blocklyPathLight,',
|
||||
'.blocklyInsertionMarker>.blocklyPathDark {',
|
||||
'fill-opacity: .2;',
|
||||
'stroke: none',
|
||||
'stroke: none;',
|
||||
'}',
|
||||
|
||||
'.blocklyMultilineText {',
|
||||
@@ -333,7 +332,8 @@ Blockly.Css.CONTENT = [
|
||||
Don't allow users to select text. It gets annoying when trying to
|
||||
drag a block and selected text moves instead.
|
||||
*/
|
||||
'.blocklySvg text, .blocklyBlockDragSurface text {',
|
||||
'.blocklySvg text,',
|
||||
'.blocklyBlockDragSurface text {',
|
||||
'user-select: none;',
|
||||
'-ms-user-select: none;',
|
||||
'-webkit-user-select: none;',
|
||||
@@ -416,7 +416,8 @@ Blockly.Css.CONTENT = [
|
||||
'z-index: 30;',
|
||||
'}',
|
||||
|
||||
'.blocklyScrollbarHorizontal, .blocklyScrollbarVertical {',
|
||||
'.blocklyScrollbarHorizontal,',
|
||||
'.blocklyScrollbarVertical {',
|
||||
'position: absolute;',
|
||||
'outline: none;',
|
||||
'}',
|
||||
@@ -449,217 +450,10 @@ Blockly.Css.CONTENT = [
|
||||
'background: #faa;',
|
||||
'}',
|
||||
|
||||
'.blocklyContextMenu {',
|
||||
'border-radius: 4px;',
|
||||
'max-height: 100%;',
|
||||
'}',
|
||||
|
||||
'.blocklyDropdownMenu {',
|
||||
'border-radius: 2px;',
|
||||
'padding: 0 !important;',
|
||||
'}',
|
||||
|
||||
'.blocklyWidgetDiv .blocklyDropdownMenu .goog-menuitem,',
|
||||
'.blocklyDropDownDiv .blocklyDropdownMenu .goog-menuitem {',
|
||||
/* 28px on the left for icon or checkbox. */
|
||||
'padding-left: 28px;',
|
||||
'}',
|
||||
|
||||
/* BiDi override for the resting state. */
|
||||
/* #noflip */
|
||||
'.blocklyWidgetDiv .blocklyDropdownMenu .goog-menuitem.goog-menuitem-rtl,',
|
||||
'.blocklyDropDownDiv .blocklyDropdownMenu .goog-menuitem.goog-menuitem-rtl {',
|
||||
/* Flip left/right padding for BiDi. */
|
||||
'padding-left: 5px;',
|
||||
'padding-right: 28px;',
|
||||
'}',
|
||||
|
||||
'.blocklyVerticalMarker {',
|
||||
'stroke-width: 3px;',
|
||||
'fill: rgba(255,255,255,.5);',
|
||||
'pointer-events: none',
|
||||
'}',
|
||||
|
||||
'.blocklyWidgetDiv .goog-option-selected .goog-menuitem-checkbox,',
|
||||
'.blocklyWidgetDiv .goog-option-selected .goog-menuitem-icon,',
|
||||
'.blocklyDropDownDiv .goog-option-selected .goog-menuitem-checkbox,',
|
||||
'.blocklyDropDownDiv .goog-option-selected .goog-menuitem-icon {',
|
||||
'background: url(<<<PATH>>>/sprites.png) no-repeat -48px -16px;',
|
||||
'}',
|
||||
|
||||
/* Copied from: goog/css/menu.css */
|
||||
/*
|
||||
* Copyright 2009 The Closure Library Authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by the Apache License, Version 2.0.
|
||||
* See the COPYING file for details.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Standard styling for menus created by goog.ui.MenuRenderer.
|
||||
*
|
||||
* @author attila@google.com (Attila Bodis)
|
||||
*/
|
||||
|
||||
'.blocklyWidgetDiv .goog-menu {',
|
||||
'background: #fff;',
|
||||
'border-color: transparent;',
|
||||
'border-style: solid;',
|
||||
'border-width: 1px;',
|
||||
'cursor: default;',
|
||||
'font: normal 13px Arial, sans-serif;',
|
||||
'margin: 0;',
|
||||
'outline: none;',
|
||||
'padding: 4px 0;',
|
||||
'position: absolute;',
|
||||
'overflow-y: auto;',
|
||||
'overflow-x: hidden;',
|
||||
'max-height: 100%;',
|
||||
'z-index: 20000;', /* Arbitrary, but some apps depend on it... */
|
||||
'box-shadow: 0px 0px 3px 1px rgba(0,0,0,.3);',
|
||||
'}',
|
||||
|
||||
'.blocklyWidgetDiv .goog-menu.focused {',
|
||||
'box-shadow: 0px 0px 6px 1px rgba(0,0,0,.3);',
|
||||
'}',
|
||||
|
||||
'.blocklyDropDownDiv .goog-menu {',
|
||||
'cursor: default;',
|
||||
'font: normal 13px "Helvetica Neue", Helvetica, sans-serif;',
|
||||
'outline: none;',
|
||||
'z-index: 20000;', /* Arbitrary, but some apps depend on it... */
|
||||
'}',
|
||||
|
||||
/* Copied from: goog/css/menuitem.css */
|
||||
/*
|
||||
* Copyright 2009 The Closure Library Authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by the Apache License, Version 2.0.
|
||||
* See the COPYING file for details.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Standard styling for menus created by goog.ui.MenuItemRenderer.
|
||||
*
|
||||
* @author attila@google.com (Attila Bodis)
|
||||
*/
|
||||
|
||||
/**
|
||||
* State: resting.
|
||||
*
|
||||
* NOTE(mleibman,chrishenry):
|
||||
* The RTL support in Closure is provided via two mechanisms -- "rtl" CSS
|
||||
* classes and BiDi flipping done by the CSS compiler. Closure supports RTL
|
||||
* with or without the use of the CSS compiler. In order for them not to
|
||||
* conflict with each other, the "rtl" CSS classes need to have the #noflip
|
||||
* annotation. The non-rtl counterparts should ideally have them as well,
|
||||
* but, since .goog-menuitem existed without .goog-menuitem-rtl for so long
|
||||
* before being added, there is a risk of people having templates where they
|
||||
* are not rendering the .goog-menuitem-rtl class when in RTL and instead
|
||||
* rely solely on the BiDi flipping by the CSS compiler. That's why we're
|
||||
* not adding the #noflip to .goog-menuitem.
|
||||
*/
|
||||
'.blocklyWidgetDiv .goog-menuitem,',
|
||||
'.blocklyDropDownDiv .goog-menuitem {',
|
||||
'color: #000;',
|
||||
'font: normal 13px Arial, sans-serif;',
|
||||
'list-style: none;',
|
||||
'margin: 0;',
|
||||
/* 7em on the right for shortcut. */
|
||||
'min-width: 7em;',
|
||||
'border: none;',
|
||||
'padding: 6px 15px;',
|
||||
'white-space: nowrap;',
|
||||
'cursor: pointer;',
|
||||
'}',
|
||||
|
||||
/* If a menu doesn't have checkable items or items with icons,
|
||||
* remove padding.
|
||||
*/
|
||||
'.blocklyWidgetDiv .goog-menu-nocheckbox .goog-menuitem,',
|
||||
'.blocklyWidgetDiv .goog-menu-noicon .goog-menuitem,',
|
||||
'.blocklyDropDownDiv .goog-menu-nocheckbox .goog-menuitem,',
|
||||
'.blocklyDropDownDiv .goog-menu-noicon .goog-menuitem {',
|
||||
'padding-left: 12px;',
|
||||
'}',
|
||||
|
||||
'.blocklyWidgetDiv .goog-menuitem-content,',
|
||||
'.blocklyDropDownDiv .goog-menuitem-content {',
|
||||
'font-family: Arial, sans-serif;',
|
||||
'font-size: 13px;',
|
||||
'}',
|
||||
|
||||
'.blocklyWidgetDiv .goog-menuitem-content {',
|
||||
'color: #000;',
|
||||
'}',
|
||||
|
||||
'.blocklyDropDownDiv .goog-menuitem-content {',
|
||||
'color: #000;',
|
||||
'}',
|
||||
|
||||
/* State: disabled. */
|
||||
'.blocklyWidgetDiv .goog-menuitem-disabled,',
|
||||
'.blocklyDropDownDiv .goog-menuitem-disabled {',
|
||||
'cursor: inherit;',
|
||||
'}',
|
||||
|
||||
'.blocklyWidgetDiv .goog-menuitem-disabled .goog-menuitem-content,',
|
||||
'.blocklyDropDownDiv .goog-menuitem-disabled .goog-menuitem-content {',
|
||||
'color: #ccc !important;',
|
||||
'}',
|
||||
|
||||
'.blocklyWidgetDiv .goog-menuitem-disabled .goog-menuitem-icon,',
|
||||
'.blocklyDropDownDiv .goog-menuitem-disabled .goog-menuitem-icon {',
|
||||
'opacity: .3;',
|
||||
'filter: alpha(opacity=30);',
|
||||
'}',
|
||||
|
||||
/* State: hover. */
|
||||
'.blocklyWidgetDiv .goog-menuitem-highlight ,',
|
||||
'.blocklyDropDownDiv .goog-menuitem-highlight {',
|
||||
'background-color: rgba(0,0,0,.1);',
|
||||
'}',
|
||||
|
||||
/* State: selected/checked. */
|
||||
'.blocklyWidgetDiv .goog-menuitem-checkbox,',
|
||||
'.blocklyWidgetDiv .goog-menuitem-icon,',
|
||||
'.blocklyDropDownDiv .goog-menuitem-checkbox,',
|
||||
'.blocklyDropDownDiv .goog-menuitem-icon {',
|
||||
'background-repeat: no-repeat;',
|
||||
'height: 16px;',
|
||||
'left: 6px;',
|
||||
'position: absolute;',
|
||||
'right: auto;',
|
||||
'vertical-align: middle;',
|
||||
'width: 16px;',
|
||||
'}',
|
||||
|
||||
/* BiDi override for the selected/checked state. */
|
||||
/* #noflip */
|
||||
'.blocklyWidgetDiv .goog-menuitem-rtl .goog-menuitem-checkbox,',
|
||||
'.blocklyWidgetDiv .goog-menuitem-rtl .goog-menuitem-icon,',
|
||||
'.blocklyDropDownDiv .goog-menuitem-rtl .goog-menuitem-checkbox,',
|
||||
'.blocklyDropDownDiv .goog-menuitem-rtl .goog-menuitem-icon {',
|
||||
/* Flip left/right positioning. */
|
||||
'left: auto;',
|
||||
'right: 6px;',
|
||||
'}',
|
||||
|
||||
'.blocklyWidgetDiv .goog-option-selected .goog-menuitem-checkbox,',
|
||||
'.blocklyWidgetDiv .goog-option-selected .goog-menuitem-icon,',
|
||||
'.blocklyDropDownDiv .goog-option-selected .goog-menuitem-checkbox,',
|
||||
'.blocklyDropDownDiv .goog-option-selected .goog-menuitem-icon {',
|
||||
'position: static;', /* Scroll with the menu. */
|
||||
'float: left;',
|
||||
'margin-left: -24px;',
|
||||
'}',
|
||||
|
||||
'.blocklyWidgetDiv .goog-menuitem-rtl .goog-menuitem-checkbox,',
|
||||
'.blocklyWidgetDiv .goog-menuitem-rtl .goog-menuitem-icon,',
|
||||
'.blocklyDropDownDiv .goog-menuitem-rtl .goog-menuitem-checkbox,',
|
||||
'.blocklyDropDownDiv .goog-menuitem-rtl .goog-menuitem-icon {',
|
||||
'float: right;',
|
||||
'margin-right: -24px;',
|
||||
'pointer-events: none;',
|
||||
'}',
|
||||
|
||||
'.blocklyComputeCanvas {',
|
||||
@@ -671,5 +465,95 @@ Blockly.Css.CONTENT = [
|
||||
'.blocklyNoPointerEvents {',
|
||||
'pointer-events: none;',
|
||||
'}',
|
||||
|
||||
'.blocklyContextMenu {',
|
||||
'border-radius: 4px;',
|
||||
'max-height: 100%;',
|
||||
'}',
|
||||
|
||||
'.blocklyDropdownMenu {',
|
||||
'border-radius: 2px;',
|
||||
'padding: 0 !important;',
|
||||
'}',
|
||||
|
||||
'.blocklyDropdownMenu .blocklyMenuItem {',
|
||||
/* 28px on the left for icon or checkbox. */
|
||||
'padding-left: 28px;',
|
||||
'}',
|
||||
|
||||
/* BiDi override for the resting state. */
|
||||
'.blocklyDropdownMenu .blocklyMenuItemRtl {',
|
||||
/* Flip left/right padding for BiDi. */
|
||||
'padding-left: 5px;',
|
||||
'padding-right: 28px;',
|
||||
'}',
|
||||
|
||||
'.blocklyWidgetDiv .blocklyMenu {',
|
||||
'background: #fff;',
|
||||
'border: 1px solid transparent;',
|
||||
'box-shadow: 0 0 3px 1px rgba(0,0,0,.3);',
|
||||
'font: normal 13px Arial, sans-serif;',
|
||||
'margin: 0;',
|
||||
'outline: none;',
|
||||
'padding: 4px 0;',
|
||||
'position: absolute;',
|
||||
'overflow-y: auto;',
|
||||
'overflow-x: hidden;',
|
||||
'max-height: 100%;',
|
||||
'z-index: 20000;', /* Arbitrary, but some apps depend on it... */
|
||||
'}',
|
||||
|
||||
'.blocklyWidgetDiv .blocklyMenu.blocklyFocused {',
|
||||
'box-shadow: 0 0 6px 1px rgba(0,0,0,.3);',
|
||||
'}',
|
||||
|
||||
'.blocklyDropDownDiv .blocklyMenu {',
|
||||
'font: normal 13px "Helvetica Neue", Helvetica, sans-serif;',
|
||||
'outline: none;',
|
||||
'z-index: 20000;', /* Arbitrary, but some apps depend on it... */
|
||||
'}',
|
||||
|
||||
/* State: resting. */
|
||||
'.blocklyMenuItem {',
|
||||
'border: none;',
|
||||
'color: #000;',
|
||||
'cursor: pointer;',
|
||||
'list-style: none;',
|
||||
'margin: 0;',
|
||||
/* 7em on the right for shortcut. */
|
||||
'min-width: 7em;',
|
||||
'padding: 6px 15px;',
|
||||
'white-space: nowrap;',
|
||||
'}',
|
||||
|
||||
/* State: disabled. */
|
||||
'.blocklyMenuItemDisabled {',
|
||||
'color: #ccc;',
|
||||
'cursor: inherit;',
|
||||
'}',
|
||||
|
||||
/* State: hover. */
|
||||
'.blocklyMenuItemHighlight {',
|
||||
'background-color: rgba(0,0,0,.1);',
|
||||
'}',
|
||||
|
||||
/* State: selected/checked. */
|
||||
'.blocklyMenuItemCheckbox {',
|
||||
'height: 16px;',
|
||||
'position: absolute;',
|
||||
'width: 16px;',
|
||||
'}',
|
||||
|
||||
'.blocklyMenuItemSelected .blocklyMenuItemCheckbox {',
|
||||
'background: url(<<<PATH>>>/sprites.png) no-repeat -48px -16px;',
|
||||
'float: left;',
|
||||
'margin-left: -24px;',
|
||||
'position: static;', /* Scroll with the menu. */
|
||||
'}',
|
||||
|
||||
'.blocklyMenuItemRtl .blocklyMenuItemCheckbox {',
|
||||
'float: right;',
|
||||
'margin-right: -24px;',
|
||||
'}',
|
||||
/* eslint-enable indent */
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user