Share isImageProperties between implementations

Author: microbit-matt-hillsdon

pxtblocks/fields/field_textdropdown.ts

@@ -1,7 +1,7 @@
 /// <reference path="../../built/pxtlib.d.ts" />
 
 import * as Blockly from "blockly";
-import { clearDropDownDiv, FieldCustom, FieldCustomOptions } from "./field_utils";
+import { clearDropDownDiv, FieldCustom, FieldCustomOptions, isImageProperties } from "./field_utils";
 
 export interface FieldTextDropdownOptions extends FieldCustomOptions {
     values?: string;
@@ -384,25 +384,4 @@ function isStringArray(arr: any[]): arr is string[] {
         }
     }
     return true;
-}
-
-/**
- * Returns whether or not an object conforms to the ImageProperties interface.
- *
- * @param obj The object to test.
- * @returns True if the object conforms to ImageProperties, otherwise false.
- */
-function isImageProperties(obj: any): obj is Blockly.ImageProperties {
-  return (
-    obj &&
-    typeof obj === 'object' &&
-    'src' in obj &&
-    typeof obj.src === 'string' &&
-    'alt' in obj &&
-    typeof obj.alt === 'string' &&
-    'width' in obj &&
-    typeof obj.width === 'number' &&
-    'height' in obj &&
-    typeof obj.height === 'number'
-  );
 }

pxtblocks/fields/field_utils.ts

@@ -699,4 +699,25 @@ function inflateJRes(jres: pxt.Map<pxt.JRes | string>): pxt.Map<pxt.JRes> {
 export function clearDropDownDiv() {
     Blockly.DropDownDiv.clearContent();
     Blockly.DropDownDiv.getContentDiv().style.height = "";
+}
+
+/**
+ * Returns whether or not an object conforms to the ImageProperties interface.
+ *
+ * @param obj The object to test.
+ * @returns True if the object conforms to ImageProperties, otherwise false.
+ */
+export function isImageProperties(obj: any): obj is Blockly.ImageProperties {
+  return (
+    obj &&
+    typeof obj === 'object' &&
+    'src' in obj &&
+    typeof obj.src === 'string' &&
+    'alt' in obj &&
+    typeof obj.alt === 'string' &&
+    'width' in obj &&
+    typeof obj.width === 'number' &&
+    'height' in obj &&
+    typeof obj.height === 'number'
+  );
 }

pxtblocks/plugins/newVariableField/fieldDropdownMixin.ts

@@ -1,4 +1,5 @@
 import * as Blockly from "blockly";
+import { isImageProperties } from "../../fields";
 
 // This is the same as showEditor_ and dropdownCreate in field_dropdown
 // except that it supports separators between dropdown menu items
@@ -85,26 +86,6 @@ export function showEditorMixin(this: Blockly.FieldDropdown, e?: MouseEvent) {
     this.applyColour();
 }
 
-/**
- * Returns whether or not an object conforms to the ImageProperties interface.
- *
- * @param obj The object to test.
- * @returns True if the object conforms to ImageProperties, otherwise false.
- */
-function isImageProperties(obj: any): obj is Blockly.ImageProperties {
-  return (
-    obj &&
-    typeof obj === 'object' &&
-    'src' in obj &&
-    typeof obj.src === 'string' &&
-    'alt' in obj &&
-    typeof obj.alt === 'string' &&
-    'width' in obj &&
-    typeof obj.width === 'number' &&
-    'height' in obj &&
-    typeof obj.height === 'number'
-  );
-}
 
 class HorizontalRuleMenuItem extends Blockly.MenuItem {
     element_: Element;