remove deprecated rendererClass and justify args

jupyterlab · Feb 24, 2020 · dd9a3d3 · dd9a3d3
1 parent fd332d1
commit dd9a3d3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 24 deletions.
diff --git a/packages/ui-components/src/icon/labicon.tsx b/packages/ui-components/src/icon/labicon.tsx
@@ -601,12 +601,7 @@ export namespace LabIcon {
    * Interface defining the parameters to be passed to the LabIcon
    * constructor
    */
-  export interface IOptions extends IIcon, Partial<VirtualElement.IRenderer> {
-    /**
-     * @deprecated does nothing
-     */
-    rendererClass?: typeof Private.Renderer;
-  }
+  export interface IOptions extends IIcon, Partial<VirtualElement.IRenderer> {}
 
   /**
    * The input props for creating a new LabIcon

diff --git a/packages/ui-components/src/style/icon.ts b/packages/ui-components/src/style/icon.ts
@@ -134,11 +134,6 @@ export namespace LabIconStyle {
      * the kind of the icon, associated with a builtin stylesheet
      */
     kind?: IStyleResolvable | IStyleResolvable[];
-
-    /**
-     * @deprecated use elementPosition instead
-     */
-    justify?: IPosition;
   }
 
   /**
@@ -512,10 +507,12 @@ export namespace LabIconStyle {
       ...styles.map(s => s.options)
     );
 
+    // add the position style (if any) with lowest precedence
     if (options.elementPosition) {
       styles.unshift(positionStyles[options.elementPosition]);
     }
 
+    // add the size style (if any) with lowest precedence
     if (options.elementSize) {
       styles.unshift(sizeStyles[options.elementSize]);
     }
@@ -548,18 +545,7 @@ export namespace LabIconStyle {
       return '';
     }
 
-    let {
-      elementPosition,
-      elementSize,
-      kind,
-      justify,
-      ...elementStyle
-    } = props;
-
-    // DEPRECATED: alias justify => elementPosition
-    if (!elementPosition) {
-      elementPosition = justify;
-    }
+    let { elementPosition, elementSize, kind, ...elementStyle } = props;
 
     // add option args with defined values to overrides
     const options = {
@@ -579,7 +565,8 @@ export namespace LabIconStyle {
     const styles = resolveKind(kind);
     styles.push({ elementStyle, options });
 
-    // apply style options/merge styles, then convert to typestyle class
+    // merge styles (while applying any style options),
+    // then convert to typestyle class
     const cls = resolveStyleClass(resolveStyles(styles));
 
     if (cacheable) {