Move new TextFields into TextControls directory (#8726)

In this PR I extract the new TextFields from the old TextFields directory. In the future, if we bring over the input chip view and text area, they will go under this new TextControls directory as well. Closes #8684.
material-components · Nov 7, 2019 · 02f9c9f · 02f9c9f
1 parent 35188a5
commit 02f9c9f
Show file tree

Hide file tree

Showing 55 changed files with 135 additions and 63 deletions.
diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec
@@ -1885,24 +1885,24 @@ Pod::Spec.new do |mdc|
     end
   end
 
-  mdc.subspec "TextFields+ContainedInputView" do |extension|
-    extension.ios.deployment_target = '9.0'
-    extension.public_header_files = "components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.h"
-    extension.source_files = [
-    "components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.{h,m}",
-    "components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/private/*.{h,m}"
+  mdc.subspec "TextControls" do |component|
+    component.ios.deployment_target = '9.0'
+    component.public_header_files = "components/#{component.base_name}/src/*.h"
+    component.source_files = [
+      "components/#{component.base_name}/src/*.{h,m}",
+      "components/#{component.base_name}/src/private/*.{h,m}"
     ]
 
-    extension.dependency "MaterialComponents/AnimationTiming"
-    extension.dependency "MaterialComponents/private/Math"
-    extension.dependency "MDFInternationalization"
+    component.dependency "MaterialComponents/AnimationTiming"
+    component.dependency "MaterialComponents/private/Math"
+    component.dependency "MDFInternationalization"
 
-    extension.test_spec 'UnitTests' do |unit_tests|
+    component.test_spec 'UnitTests' do |unit_tests|
       unit_tests.source_files = [
-      "components/#{extension.base_name.split('+')[0]}/tests/unit/#{extension.base_name.split('+')[1]}/*.{h,m,swift}",
-      "components/#{extension.base_name.split('+')[0]}/tests/unit/#{extension.base_name.split('+')[1]}/supplemental/*.{h,m,swift}"
+        "components/#{component.base_name}/tests/unit/*.{h,m,swift}",
+        "components/#{component.base_name}/tests/unit/supplemental/*.{h,m,swift}"
       ]
-      unit_tests.resources = "components/#{extension.base_name.split('+')[0]}/tests/unit/#{extension.base_name.split('+')[1]}/resources/*"
+      unit_tests.resources = "components/#{component.base_name.split('+')[0]}/tests/unit/#{component.base_name.split('+')[1]}/resources/*"
     end
   end
 

diff --git a/catalog/Podfile b/catalog/Podfile
@@ -70,7 +70,7 @@ target "MDCCatalog" do
     'Tabs/UnitTests',
     'Tabs+Theming/UnitTests',
     'TextFields/UnitTests',
-    'TextFields+ContainedInputView/UnitTests',
+    'TextControls/UnitTests',
     'TextFields+Theming/UnitTests',
     'Themes/UnitTests',
     'Typography/UnitTests',

diff --git a/components/TextControls/BUILD b/components/TextControls/BUILD
@@ -0,0 +1,96 @@
+# Copyright 2017-present The Material Components for iOS Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+load(
+    "//:material_components_ios.bzl",
+    "mdc_examples_objc_library",
+    "mdc_objc_library",
+    "mdc_public_objc_library",
+    "mdc_snapshot_objc_library",
+    "mdc_snapshot_test",
+    "mdc_unit_test_objc_library",
+    "mdc_unit_test_suite",
+)
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+licenses(["notice"])
+
+mdc_objc_library(
+    name = "private",
+    hdrs = native.glob(["src/private/*.h"]),
+    includes = ["src/private"],
+    visibility = [":test_targets"],
+)
+
+package_group(
+    name = "test_targets",
+    packages = [
+        "//components/TextControls/...",
+    ],
+)
+
+mdc_public_objc_library(
+    name = "TextControls",
+    sdk_frameworks = [
+        "QuartzCore",
+    ],
+    deps = [
+        "//components/AnimationTiming",
+        "@material_internationalization_ios//:MDFInternationalization",
+        "//components/private/Math",
+    ],
+)
+
+mdc_examples_objc_library(
+    name = "ObjcExamples",
+    deps = [
+        "TextControls",
+        "//components/Buttons",
+        "//components/schemes/Container",
+    ],
+)
+
+mdc_unit_test_objc_library(
+    name = "unit_test_sources",
+    deps = [
+        ":TextControls",
+        ":private",
+    ],
+)
+
+mdc_snapshot_objc_library(
+    name = "snapshot_test_lib",
+    sdk_frameworks = [
+        "CoreGraphics",
+    ],
+    deps = [
+        ":TextControls",
+        ":private",
+    ],
+)
+
+mdc_snapshot_test(
+    name = "snapshot_tests",
+    timeout = "long",
+    deps = ["snapshot_test_lib"],
+)
+
+mdc_unit_test_suite(
+    name = "unit_tests",
+    deps = [
+        ":unit_test_sources",
+    ],
+    # TODO (https://github.com/material-components/material-components-ios/issues/8249): Re-enable autobot environment.
+    use_autobot_environment_runner = False,
+)
diff --git a/components/TextControls/README.md b/components/TextControls/README.md
diff --git a/...DCTextControlTextFieldTypicalUseExample.m → ...DCTextControlTextFieldTypicalUseExample.m b/...DCTextControlTextFieldTypicalUseExample.m → ...DCTextControlTextFieldTypicalUseExample.m
@@ -16,7 +16,7 @@
 
 #import "MaterialButtons.h"
 #import "MaterialContainerScheme.h"
-#import "MaterialTextFields+ContainedInputView.h"
+#import "MaterialTextControls.h"
 
 static NSString *const kExampleTitle = @"MDCTextControl TextFields";
 static CGFloat const kDefaultPadding = 15.0;

diff --git a/...src/ContainedInputView/MDCBaseTextField.h → ...nents/TextControls/src/MDCBaseTextField.h b/...src/ContainedInputView/MDCBaseTextField.h → ...nents/TextControls/src/MDCBaseTextField.h
diff --git a/...src/ContainedInputView/MDCBaseTextField.m → ...nents/TextControls/src/MDCBaseTextField.m b/...src/ContainedInputView/MDCBaseTextField.m → ...nents/TextControls/src/MDCBaseTextField.m
diff --git a/...c/ContainedInputView/MDCFilledTextField.h → ...nts/TextControls/src/MDCFilledTextField.h b/...c/ContainedInputView/MDCFilledTextField.h → ...nts/TextControls/src/MDCFilledTextField.h
diff --git a/...c/ContainedInputView/MDCFilledTextField.m → ...nts/TextControls/src/MDCFilledTextField.m b/...c/ContainedInputView/MDCFilledTextField.m → ...nts/TextControls/src/MDCFilledTextField.m
diff --git a/...ContainedInputView/MDCOutlinedTextField.h → ...s/TextControls/src/MDCOutlinedTextField.h b/...ContainedInputView/MDCOutlinedTextField.h → ...s/TextControls/src/MDCOutlinedTextField.h
diff --git a/...ContainedInputView/MDCOutlinedTextField.m → ...s/TextControls/src/MDCOutlinedTextField.m b/...ContainedInputView/MDCOutlinedTextField.m → ...s/TextControls/src/MDCOutlinedTextField.m
diff --git a/...edInputView/MDCTextControlLabelBehavior.h → ...ontrols/src/MDCTextControlLabelBehavior.h b/...edInputView/MDCTextControlLabelBehavior.h → ...ontrols/src/MDCTextControlLabelBehavior.h
diff --git a/.../ContainedInputView/MDCTextControlState.h → ...ts/TextControls/src/MDCTextControlState.h b/.../ContainedInputView/MDCTextControlState.h → ...ts/TextControls/src/MDCTextControlState.h
diff --git a/...w/MaterialTextFields+ContainedInputView.h → ...s/TextControls/src/MaterialTextControls.h b/...w/MaterialTextFields+ContainedInputView.h → ...s/TextControls/src/MaterialTextControls.h
diff --git a/...private/MDCBaseTextField+MDCTextControl.h → ...private/MDCBaseTextField+MDCTextControl.h b/...private/MDCBaseTextField+MDCTextControl.h → ...private/MDCBaseTextField+MDCTextControl.h
diff --git a/...nputView/private/MDCBaseTextFieldLayout.h → ...rols/src/private/MDCBaseTextFieldLayout.h b/...nputView/private/MDCBaseTextFieldLayout.h → ...rols/src/private/MDCBaseTextFieldLayout.h
diff --git a/...nputView/private/MDCBaseTextFieldLayout.m → ...rols/src/private/MDCBaseTextFieldLayout.m b/...nputView/private/MDCBaseTextFieldLayout.m → ...rols/src/private/MDCBaseTextFieldLayout.m
diff --git a/...ntainedInputView/private/MDCTextControl.h → ...TextControls/src/private/MDCTextControl.h b/...ntainedInputView/private/MDCTextControl.h → ...TextControls/src/private/MDCTextControl.h
diff --git a/...DCTextControlAssistiveLabelDrawPriority.h → ...DCTextControlAssistiveLabelDrawPriority.h b/...DCTextControlAssistiveLabelDrawPriority.h → ...DCTextControlAssistiveLabelDrawPriority.h
diff --git a/...rivate/MDCTextControlAssistiveLabelView.h → ...rivate/MDCTextControlAssistiveLabelView.h b/...rivate/MDCTextControlAssistiveLabelView.h → ...rivate/MDCTextControlAssistiveLabelView.h
diff --git a/...rivate/MDCTextControlAssistiveLabelView.m → ...rivate/MDCTextControlAssistiveLabelView.m b/...rivate/MDCTextControlAssistiveLabelView.m → ...rivate/MDCTextControlAssistiveLabelView.m
diff --git a/.../MDCTextControlAssistiveLabelViewLayout.h → .../MDCTextControlAssistiveLabelViewLayout.h b/.../MDCTextControlAssistiveLabelViewLayout.h → .../MDCTextControlAssistiveLabelViewLayout.h
diff --git a/.../MDCTextControlAssistiveLabelViewLayout.m → .../MDCTextControlAssistiveLabelViewLayout.m b/.../MDCTextControlAssistiveLabelViewLayout.m → .../MDCTextControlAssistiveLabelViewLayout.m
diff --git a/...ew/private/MDCTextControlColorViewModel.h → ...rc/private/MDCTextControlColorViewModel.h b/...ew/private/MDCTextControlColorViewModel.h → ...rc/private/MDCTextControlColorViewModel.h
diff --git a/...ew/private/MDCTextControlColorViewModel.m → ...rc/private/MDCTextControlColorViewModel.m b/...ew/private/MDCTextControlColorViewModel.m → ...rc/private/MDCTextControlColorViewModel.m
diff --git a/...ew/private/MDCTextControlLabelAnimation.h → ...rc/private/MDCTextControlLabelAnimation.h b/...ew/private/MDCTextControlLabelAnimation.h → ...rc/private/MDCTextControlLabelAnimation.h
diff --git a/...ew/private/MDCTextControlLabelAnimation.m → ...rc/private/MDCTextControlLabelAnimation.m b/...ew/private/MDCTextControlLabelAnimation.m → ...rc/private/MDCTextControlLabelAnimation.m
diff --git a/...utView/private/MDCTextControlLabelState.h → ...ls/src/private/MDCTextControlLabelState.h b/...utView/private/MDCTextControlLabelState.h → ...ls/src/private/MDCTextControlLabelState.h
diff --git a/...putView/private/MDCTextControlStyleBase.h → ...ols/src/private/MDCTextControlStyleBase.h b/...putView/private/MDCTextControlStyleBase.h → ...ols/src/private/MDCTextControlStyleBase.h
diff --git a/...putView/private/MDCTextControlStyleBase.m → ...ols/src/private/MDCTextControlStyleBase.m b/...putView/private/MDCTextControlStyleBase.m → ...ols/src/private/MDCTextControlStyleBase.m
diff --git a/...tView/private/MDCTextControlStyleFilled.h → ...s/src/private/MDCTextControlStyleFilled.h b/...tView/private/MDCTextControlStyleFilled.h → ...s/src/private/MDCTextControlStyleFilled.h
diff --git a/...tView/private/MDCTextControlStyleFilled.m → ...s/src/private/MDCTextControlStyleFilled.m b/...tView/private/MDCTextControlStyleFilled.m → ...s/src/private/MDCTextControlStyleFilled.m
diff --git a/...iew/private/MDCTextControlStyleOutlined.h → ...src/private/MDCTextControlStyleOutlined.h b/...iew/private/MDCTextControlStyleOutlined.h → ...src/private/MDCTextControlStyleOutlined.h
diff --git a/...iew/private/MDCTextControlStyleOutlined.m → ...src/private/MDCTextControlStyleOutlined.m b/...iew/private/MDCTextControlStyleOutlined.m → ...src/private/MDCTextControlStyleOutlined.m
diff --git a/...TextControlVerticalPositioningReference.h → ...TextControlVerticalPositioningReference.h b/...TextControlVerticalPositioningReference.h → ...TextControlVerticalPositioningReference.h
diff --git a/...ControlVerticalPositioningReferenceBase.h → ...ControlVerticalPositioningReferenceBase.h b/...ControlVerticalPositioningReferenceBase.h → ...ControlVerticalPositioningReferenceBase.h
diff --git a/...ControlVerticalPositioningReferenceBase.m → ...ControlVerticalPositioningReferenceBase.m b/...ControlVerticalPositioningReferenceBase.m → ...ControlVerticalPositioningReferenceBase.m
diff --git a/...ntrolVerticalPositioningReferenceFilled.h → ...ntrolVerticalPositioningReferenceFilled.h b/...ntrolVerticalPositioningReferenceFilled.h → ...ntrolVerticalPositioningReferenceFilled.h
diff --git a/...ntrolVerticalPositioningReferenceFilled.m → ...ntrolVerticalPositioningReferenceFilled.m b/...ntrolVerticalPositioningReferenceFilled.m → ...ntrolVerticalPositioningReferenceFilled.m
diff --git a/...rolVerticalPositioningReferenceOutlined.h → ...rolVerticalPositioningReferenceOutlined.h b/...rolVerticalPositioningReferenceOutlined.h → ...rolVerticalPositioningReferenceOutlined.h
diff --git a/...rolVerticalPositioningReferenceOutlined.m → ...rolVerticalPositioningReferenceOutlined.m b/...rolVerticalPositioningReferenceOutlined.m → ...rolVerticalPositioningReferenceOutlined.m
diff --git a/...rivate/UIBezierPath+MDCTextControlStyle.h → ...rivate/UIBezierPath+MDCTextControlStyle.h b/...rivate/UIBezierPath+MDCTextControlStyle.h → ...rivate/UIBezierPath+MDCTextControlStyle.h
diff --git a/...rivate/UIBezierPath+MDCTextControlStyle.m → ...rivate/UIBezierPath+MDCTextControlStyle.m b/...rivate/UIBezierPath+MDCTextControlStyle.m → ...rivate/UIBezierPath+MDCTextControlStyle.m
diff --git a/.../snapshot/MDCBaseTextFieldSnapshotTests.m → .../snapshot/MDCBaseTextFieldSnapshotTests.m b/.../snapshot/MDCBaseTextFieldSnapshotTests.m → .../snapshot/MDCBaseTextFieldSnapshotTests.m
@@ -16,10 +16,10 @@
 
 #import <UIKit/UIKit.h>
 
-#import "../../src/ContainedInputView/private/MDCTextControl.h"
-#import "MDCBaseTextFieldTestsSnapshotTestHelpers.h"
-#import "MDCTextControlSnapshotTestHelpers.h"
-#import "MaterialTextFields+ContainedInputView.h"
+#import "../../src/private/MDCTextControl.h"
+#import "MaterialTextControls.h"
+#import "supplemental/MDCBaseTextFieldTestsSnapshotTestHelpers.h"
+#import "supplemental/MDCTextControlSnapshotTestHelpers.h"
 
 @interface MDCBaseTextFieldTestsSnapshotTests : MDCSnapshotTestCase
 @property(strong, nonatomic) MDCBaseTextField *textField;

diff --git a/...napshot/MDCFilledTextFieldSnapshotTests.m → ...napshot/MDCFilledTextFieldSnapshotTests.m b/...napshot/MDCFilledTextFieldSnapshotTests.m → ...napshot/MDCFilledTextFieldSnapshotTests.m
@@ -16,10 +16,10 @@
 
 #import <UIKit/UIKit.h>
 
-#import "../../src/ContainedInputView/private/MDCTextControl.h"
-#import "MDCBaseTextFieldTestsSnapshotTestHelpers.h"
-#import "MDCTextControlSnapshotTestHelpers.h"
-#import "MaterialTextFields+ContainedInputView.h"
+#import "../../src/private/MDCTextControl.h"
+#import "MaterialTextControls.h"
+#import "supplemental/MDCBaseTextFieldTestsSnapshotTestHelpers.h"
+#import "supplemental/MDCTextControlSnapshotTestHelpers.h"
 
 @interface MDCFilledTextFieldTestsSnapshotTests : MDCSnapshotTestCase
 @property(strong, nonatomic) MDCFilledTextField *textField;

diff --git a/...pshot/MDCOutlinedTextFieldSnapshotTests.m → ...pshot/MDCOutlinedTextFieldSnapshotTests.m b/...pshot/MDCOutlinedTextFieldSnapshotTests.m → ...pshot/MDCOutlinedTextFieldSnapshotTests.m
@@ -16,10 +16,10 @@
 
 #import <UIKit/UIKit.h>
 
-#import "../../src/ContainedInputView/private/MDCTextControl.h"
-#import "MDCBaseTextFieldTestsSnapshotTestHelpers.h"
-#import "MDCTextControlSnapshotTestHelpers.h"
-#import "MaterialTextFields+ContainedInputView.h"
+#import "../../src/private/MDCTextControl.h"
+#import "MaterialTextControls.h"
+#import "supplemental/MDCBaseTextFieldTestsSnapshotTestHelpers.h"
+#import "supplemental/MDCTextControlSnapshotTestHelpers.h"
 
 @interface MDCOutlinedTextFieldTestsSnapshotTests : MDCSnapshotTestCase
 @property(strong, nonatomic) MDCOutlinedTextField *textField;

diff --git a/...DCBaseTextFieldTestsSnapshotTestHelpers.h → ...DCBaseTextFieldTestsSnapshotTestHelpers.h b/...DCBaseTextFieldTestsSnapshotTestHelpers.h → ...DCBaseTextFieldTestsSnapshotTestHelpers.h
@@ -16,7 +16,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import "MaterialTextFields+ContainedInputView.h"
+#import "MaterialTextControls.h"
 
 @interface MDCBaseTextFieldTestsSnapshotTestHelpers : NSObject
 

diff --git a/...DCBaseTextFieldTestsSnapshotTestHelpers.m → ...DCBaseTextFieldTestsSnapshotTestHelpers.m b/...DCBaseTextFieldTestsSnapshotTestHelpers.m → ...DCBaseTextFieldTestsSnapshotTestHelpers.m
diff --git a/...pshot/MDCTextControlSnapshotTestHelpers.h → ...ental/MDCTextControlSnapshotTestHelpers.h b/...pshot/MDCTextControlSnapshotTestHelpers.h → ...ental/MDCTextControlSnapshotTestHelpers.h
@@ -16,7 +16,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import "../../src/ContainedInputView/private/MDCTextControl.h"
+#import "../../../src/private/MDCTextControl.h"
 
 @interface MDCTextControlSnapshotTestHelpers : NSObject
 

diff --git a/...pshot/MDCTextControlSnapshotTestHelpers.m → ...ental/MDCTextControlSnapshotTestHelpers.m b/...pshot/MDCTextControlSnapshotTestHelpers.m → ...ental/MDCTextControlSnapshotTestHelpers.m
@@ -16,7 +16,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import "../../src/ContainedInputView/MaterialTextFields+ContainedInputView.h"
+#import "MaterialTextControls.h"
 
 #import "MDCTextControlSnapshotTestHelpers.h"
 

diff --git a/...edInputView/MDCBaseTextFieldLayoutTests.m → .../tests/unit/MDCBaseTextFieldLayoutTests.m b/...edInputView/MDCBaseTextFieldLayoutTests.m → .../tests/unit/MDCBaseTextFieldLayoutTests.m
@@ -14,10 +14,11 @@
 
 #import <XCTest/XCTest.h>
 
-#import "../../../src/ContainedInputView/private/MDCBaseTextFieldLayout.h"
-#import "../../../src/ContainedInputView/private/MDCTextControlAssistiveLabelView.h"
-#import "../../../src/ContainedInputView/private/MDCTextControlVerticalPositioningReferenceBase.h"
-#import "MaterialTextFields+ContainedInputView.h"
+#import "MaterialTextControls.h"
+
+#import "../../src/private/MDCBaseTextFieldLayout.h"
+#import "../../src/private/MDCTextControlAssistiveLabelView.h"
+#import "../../src/private/MDCTextControlVerticalPositioningReferenceBase.h"
 
 @interface MDCBaseTextFieldLayout (Testing)
 - (CGFloat)textHeightWithFont:(UIFont *)font;

diff --git a/...ontainedInputView/MDCBaseTextFieldTests.m → ...ntrols/tests/unit/MDCBaseTextFieldTests.m b/...ontainedInputView/MDCBaseTextFieldTests.m → ...ntrols/tests/unit/MDCBaseTextFieldTests.m
@@ -14,9 +14,9 @@
 
 #import <XCTest/XCTest.h>
 
-#import "MaterialTextFields+ContainedInputView.h"
+#import "MaterialTextControls.h"
 
-#import "../../../src/ContainedInputView/private/MDCTextControlLabelState.h"
+#import "../../src/private/MDCTextControlLabelState.h"
 
 @interface MDCBaseTextField (Private)
 @property(nonatomic, assign) UIUserInterfaceLayoutDirection layoutDirection;

diff --git a/...tainedInputView/MDCFilledTextFieldTests.m → ...rols/tests/unit/MDCFilledTextFieldTests.m b/...tainedInputView/MDCFilledTextFieldTests.m → ...rols/tests/unit/MDCFilledTextFieldTests.m
@@ -14,7 +14,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "MaterialTextFields+ContainedInputView.h"
+#import "MaterialTextControls.h"
 
 @interface MDCFilledTextFieldTests : XCTestCase
 @end

diff --git a/...inedInputView/MDCOutlinedTextFieldTests.m → ...ls/tests/unit/MDCOutlinedTextFieldTests.m b/...inedInputView/MDCOutlinedTextFieldTests.m → ...ls/tests/unit/MDCOutlinedTextFieldTests.m
@@ -14,7 +14,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "MaterialTextFields+ContainedInputView.h"
+#import "MaterialTextControls.h"
 
 @interface MDCOutlinedTextFieldTests : XCTestCase
 @end

diff --git a/components/TextFields/BUILD b/components/TextFields/BUILD
@@ -58,15 +58,6 @@ mdc_public_objc_library(
     ],
 )
 
-mdc_extension_objc_library(
-    name = "ContainedInputView",
-    deps = [
-        "//components/AnimationTiming",
-        "@material_internationalization_ios//:MDFInternationalization",
-        "//components/private/Math",
-    ],
-)
-
 mdc_extension_objc_library(
     name = "Theming",
     deps = [
@@ -105,7 +96,6 @@ mdc_examples_objc_library(
     name = "ObjcExamples",
     deps = [
         ":ColorThemer",
-        ":ContainedInputView",
         ":TextFields",
         ":TypographyThemer",
         "//components/Buttons",
@@ -123,23 +113,10 @@ mdc_examples_swift_library(
     ],
 )
 
-mdc_objc_library(
-    name = "ContainedInputViewPrivateHeaders",
-    hdrs = native.glob(["src/ContainedInputView/private/*.h"]),
-    includes = ["src/private"],
-    visibility = ["//visibility:private"],
-)
-
 mdc_unit_test_objc_library(
     name = "unit_test_sources",
-    extra_srcs = glob([
-        "tests/unit/ContainedInputView/*.m",
-        "tests/unit/ContainedInputView/private/*.m",
-    ]),
     deps = [
         ":ColorThemer",
-        ":ContainedInputView",
-        ":ContainedInputViewPrivateHeaders",
         ":FontThemer",
         ":TextFields",
         ":TypographyThemer",
@@ -158,8 +135,6 @@ mdc_snapshot_objc_library(
     ],
     deps = [
         ":ColorThemer",
-        ":ContainedInputView",
-        ":ContainedInputViewPrivateHeaders",
         ":FontThemer",
         ":TextFields",
         ":TypographyThemer",