diff --git a/packages/core/src/render3/instructions/all.ts b/packages/core/src/render3/instructions/all.ts index 3da86419c1..daa2da3810 100644 --- a/packages/core/src/render3/instructions/all.ts +++ b/packages/core/src/render3/instructions/all.ts @@ -43,7 +43,7 @@ export * from './projection'; export * from './property'; export * from './property_interpolation'; export * from './advance'; -export * from '../styling/instructions'; +export * from './styling'; export * from './text'; export * from './text_interpolation'; export * from './class_map_interpolation'; diff --git a/packages/core/src/render3/instructions/class_map_interpolation.ts b/packages/core/src/render3/instructions/class_map_interpolation.ts index 4ee32b3331..4841a603e8 100644 --- a/packages/core/src/render3/instructions/class_map_interpolation.ts +++ b/packages/core/src/render3/instructions/class_map_interpolation.ts @@ -7,7 +7,7 @@ */ import {getLView, getSelectedIndex} from '../state'; -import {classMapInternal} from '../styling/instructions'; +import {classMapInternal} from './styling'; import {interpolation1, interpolation2, interpolation3, interpolation4, interpolation5, interpolation6, interpolation7, interpolation8, interpolationV} from './interpolation'; diff --git a/packages/core/src/render3/instructions/element.ts b/packages/core/src/render3/instructions/element.ts index 64297afa2d..6aa76d436c 100644 --- a/packages/core/src/render3/instructions/element.ts +++ b/packages/core/src/render3/instructions/element.ts @@ -17,7 +17,7 @@ import {BINDING_INDEX, HEADER_OFFSET, LView, RENDERER, TVIEW, T_HOST} from '../i import {assertNodeType} from '../node_assert'; import {appendChild} from '../node_manipulation'; import {decreaseElementDepthCount, getElementDepthCount, getIsParent, getLView, getNamespace, getPreviousOrParentTNode, getSelectedIndex, increaseElementDepthCount, setIsNotParent, setPreviousOrParentTNode} from '../state'; -import {registerInitialStylingOnTNode} from '../styling/instructions'; +import {registerInitialStylingOnTNode} from './styling'; import {StylingMapArray, TStylingContext} from '../styling/interfaces'; import {getInitialStylingValue, hasClassInput, hasStyleInput} from '../styling/util'; import {setUpAttributes} from '../util/attrs_utils'; diff --git a/packages/core/src/render3/instructions/element_container.ts b/packages/core/src/render3/instructions/element_container.ts index 6903736b3c..21fba86731 100644 --- a/packages/core/src/render3/instructions/element_container.ts +++ b/packages/core/src/render3/instructions/element_container.ts @@ -15,7 +15,7 @@ import {BINDING_INDEX, HEADER_OFFSET, RENDERER, TVIEW, T_HOST} from '../interfac import {assertNodeType} from '../node_assert'; import {appendChild} from '../node_manipulation'; import {getIsParent, getLView, getPreviousOrParentTNode, setIsNotParent, setPreviousOrParentTNode} from '../state'; -import {registerInitialStylingOnTNode} from '../styling/instructions'; +import {registerInitialStylingOnTNode} from './styling'; import {createDirectivesInstances, executeContentQueries, getOrCreateTNode, resolveDirectives, saveResolvedLocalsInData} from './shared'; diff --git a/packages/core/src/render3/instructions/style_prop_interpolation.ts b/packages/core/src/render3/instructions/style_prop_interpolation.ts index feadfbcf2a..1a9fc99c78 100644 --- a/packages/core/src/render3/instructions/style_prop_interpolation.ts +++ b/packages/core/src/render3/instructions/style_prop_interpolation.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import {getLView, getSelectedIndex} from '../state'; -import {stylePropInternal} from '../styling/instructions'; +import {stylePropInternal} from './styling'; import {interpolation1, interpolation2, interpolation3, interpolation4, interpolation5, interpolation6, interpolation7, interpolation8, interpolationV} from './interpolation'; import {TsickleIssue1009} from './shared'; diff --git a/packages/core/src/render3/styling/instructions.ts b/packages/core/src/render3/instructions/styling.ts similarity index 98% rename from packages/core/src/render3/styling/instructions.ts rename to packages/core/src/render3/instructions/styling.ts index bf4688d468..a6551babce 100644 --- a/packages/core/src/render3/styling/instructions.ts +++ b/packages/core/src/render3/instructions/styling.ts @@ -16,11 +16,11 @@ import {NO_CHANGE} from '../tokens'; import {renderStringify} from '../util/misc_utils'; import {getNativeByTNode, getTNode} from '../util/view_utils'; -import {applyStylingMapDirectly, applyStylingValueDirectly, flushStyling, setClass, setStyle, updateClassViaContext, updateStyleViaContext} from './bindings'; -import {StylingMapArray, StylingMapArrayIndex, TStylingContext} from './interfaces'; -import {activateStylingMapFeature} from './map_based_bindings'; -import {attachStylingDebugObject} from './styling_debug'; -import {addItemToStylingMap, allocStylingMapArray, allocTStylingContext, allowDirectStyling, concatString, forceClassesAsString, forceStylesAsString, getInitialStylingValue, getStylingMapArray, hasClassInput, hasStyleInput, hasValueChanged, isContextLocked, isHostStylingActive, isStylingContext, normalizeIntoStylingMap, setValue, stylingMapToString} from './util'; +import {applyStylingMapDirectly, applyStylingValueDirectly, flushStyling, setClass, setStyle, updateClassViaContext, updateStyleViaContext} from '../styling/bindings'; +import {StylingMapArray, StylingMapArrayIndex, TStylingContext} from '../styling/interfaces'; +import {activateStylingMapFeature} from '../styling/map_based_bindings'; +import {attachStylingDebugObject} from '../styling/styling_debug'; +import {addItemToStylingMap, allocStylingMapArray, allocTStylingContext, allowDirectStyling, concatString, forceClassesAsString, forceStylesAsString, getInitialStylingValue, getStylingMapArray, hasClassInput, hasStyleInput, hasValueChanged, isContextLocked, isHostStylingActive, isStylingContext, normalizeIntoStylingMap, setValue, stylingMapToString} from '../styling/util'; diff --git a/packages/core/test/render3/perf/map_based_style_and_class_bindings/index.ts b/packages/core/test/render3/perf/map_based_style_and_class_bindings/index.ts index 82810655a6..f8f74bb2f8 100644 --- a/packages/core/test/render3/perf/map_based_style_and_class_bindings/index.ts +++ b/packages/core/test/render3/perf/map_based_style_and_class_bindings/index.ts @@ -8,9 +8,9 @@ import {ɵɵadvance} from '../../../../src/render3/instructions/advance'; import {ɵɵelement, ɵɵelementEnd, ɵɵelementStart} from '../../../../src/render3/instructions/element'; import {refreshView} from '../../../../src/render3/instructions/shared'; +import {ɵɵclassMap, ɵɵstyleMap} from '../../../../src/render3/instructions/styling'; import {RenderFlags} from '../../../../src/render3/interfaces/definition'; import {TVIEW} from '../../../../src/render3/interfaces/view'; -import {ɵɵclassMap, ɵɵstyleMap} from '../../../../src/render3/styling/instructions'; import {createBenchmark} from '../micro_bench'; import {setupRootViewWithEmbeddedViews} from '../setup'; diff --git a/packages/core/test/render3/perf/style_and_class_bindings/index.ts b/packages/core/test/render3/perf/style_and_class_bindings/index.ts index eb55377a92..09ebb63a61 100644 --- a/packages/core/test/render3/perf/style_and_class_bindings/index.ts +++ b/packages/core/test/render3/perf/style_and_class_bindings/index.ts @@ -8,10 +8,10 @@ import {ɵɵadvance} from '../../../../src/render3/instructions/advance'; import {ɵɵelement, ɵɵelementEnd, ɵɵelementStart} from '../../../../src/render3/instructions/element'; import {refreshView} from '../../../../src/render3/instructions/shared'; +import {ɵɵclassProp, ɵɵstyleProp} from '../../../../src/render3/instructions/styling'; import {RenderFlags} from '../../../../src/render3/interfaces/definition'; import {AttributeMarker} from '../../../../src/render3/interfaces/node'; import {TVIEW} from '../../../../src/render3/interfaces/view'; -import {ɵɵclassProp, ɵɵstyleProp} from '../../../../src/render3/styling/instructions'; import {createBenchmark} from '../micro_bench'; import {setupRootViewWithEmbeddedViews} from '../setup'; diff --git a/packages/core/test/render3/perf/style_binding/index.ts b/packages/core/test/render3/perf/style_binding/index.ts index 48cf17135c..4457439545 100644 --- a/packages/core/test/render3/perf/style_binding/index.ts +++ b/packages/core/test/render3/perf/style_binding/index.ts @@ -8,9 +8,9 @@ import {ɵɵadvance} from '../../../../src/render3/instructions/advance'; import {ɵɵelement, ɵɵelementEnd, ɵɵelementStart} from '../../../../src/render3/instructions/element'; import {refreshView} from '../../../../src/render3/instructions/shared'; +import {ɵɵstyleProp} from '../../../../src/render3/instructions/styling'; import {RenderFlags} from '../../../../src/render3/interfaces/definition'; import {TVIEW} from '../../../../src/render3/interfaces/view'; -import {ɵɵstyleProp} from '../../../../src/render3/styling/instructions'; import {createBenchmark} from '../micro_bench'; import {setupRootViewWithEmbeddedViews} from '../setup';