Skip to content

Commit e3fd7ff

Browse files
committed
clean up diff
1 parent 29a8104 commit e3fd7ff

File tree

6 files changed

+6
-15
lines changed

6 files changed

+6
-15
lines changed

Libraries/Text/Text.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ const Text: React.AbstractComponent<
224224
<NativeVirtualText
225225
{...restProps}
226226
accessibilityState={_accessibilityState}
227-
accessibilityUnit={{hours: 10}}
227+
accessibilityUnit={props.accessibilityUnit}
228228
{...eventHandlersForText}
229229
accessibilityLabel={ariaLabel ?? accessibilityLabel}
230230
accessibilityRole={
@@ -244,7 +244,7 @@ const Text: React.AbstractComponent<
244244
<NativeText
245245
{...restProps}
246246
{...eventHandlersForText}
247-
accessibilityUnit={{hours: 10}}
247+
accessibilityUnit={props.accessibilityUnit}
248248
disabled={_disabled}
249249
selectable={_selectable}
250250
accessible={

ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import android.graphics.Color;
1111
import android.os.Build;
1212
import android.text.TextUtils;
13-
import android.util.Log;
1413
import android.view.View;
1514
import android.view.ViewParent;
1615
import android.view.accessibility.AccessibilityEvent;
@@ -322,7 +321,7 @@ public void setViewState(@NonNull T view, @Nullable ReadableMap accessibilitySta
322321
@Override
323322
@ReactProp(name = ViewProps.ACCESSIBILITY_UNIT)
324323
public void setAccessibilityUnit(@NonNull T view, @Nullable ReadableMap accessibilityUnit) {
325-
Log.w("TESTING::BaseViewManager", "setAccessibilityUnit");
324+
// do nothing
326325
}
327326

328327
private void updateViewContentDescription(@NonNull T view) {

ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import android.util.Log;
1616
import android.view.Gravity;
1717
import android.view.View;
18-
1918
import androidx.annotation.NonNull;
2019
import androidx.annotation.Nullable;
2120
import com.facebook.common.logging.FLog;

ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import android.text.Layout;
1212
import android.text.TextUtils;
1313
import android.util.LayoutDirection;
14-
import android.util.Log;
1514
import android.view.Gravity;
1615
import androidx.annotation.Nullable;
1716
import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
@@ -614,9 +613,7 @@ private void setAccessibilityRole(@Nullable String accessibilityRole) {
614613
}
615614

616615
private void setAccessibilityUnit(@Nullable String accessibilityUnit) {
617-
if (accessibilityUnit != null) {
618-
Log.w("TESTING::TextAttributeProps", "accessibilityUnit: " + (accessibilityUnit));
619-
}
616+
// not yet implemented
620617
}
621618

622619
public static int getTextBreakStrategy(@Nullable String textBreakStrategy) {

ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import android.text.StaticLayout;
2020
import android.text.TextPaint;
2121
import android.util.LayoutDirection;
22-
import android.util.Log;
2322
import android.util.LruCache;
2423
import android.view.View;
2524
import androidx.annotation.NonNull;
@@ -231,9 +230,6 @@ private static Spannable createSpannableFromAttributedString(
231230
// a new spannable will be wiped out
232231
List<SetSpanOperation> ops = new ArrayList<>();
233232

234-
Log.w(
235-
"TESTING::TextLayoutManagerMapBuffer",
236-
"getMapBuffer(AS_KEY_FRAGMENTS): " + (attributedString.getMapBuffer(AS_KEY_FRAGMENTS)));
237233
buildSpannableFromFragment(context, attributedString.getMapBuffer(AS_KEY_FRAGMENTS), sb, ops);
238234

239235
// TODO T31905686: add support for inline Images

packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,10 @@ class AccessibilityExample extends React.Component<{}> {
169169
</View>
170170
<View>
171171
<Text accessible={true}>
172-
My number is <View accessibilityUnit={{hours: '10'}} />
172+
My number is
173173
<Text
174174
accessibilityRole="time"
175-
accessibilityUnit={{hours: '10'}}
175+
accessibilityUnit={{hours: '30'}}
176176
accessible={true}
177177
style={{backgroundColor: 'red'}}>
178178
17:00

0 commit comments

Comments
 (0)