Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correctly merge ExposedDropdownMenu from Material 3 1.3 #1423

Merged
merged 2 commits into from
Jun 28, 2024
+1,114 −364
Merged

Correctly merge ExposedDropdownMenu from Material 3 1.3 #1423

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68f5df2
Correctly merge `ExposedDropdownMenu` from Material 3 1.3
MatkovIvan Jun 27, 2024
89f1362
Update API dump
MatkovIvan Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Loading
Loading status checks…
Update API dump
@MatkovIvan
MatkovIvan committed Jun 27, 2024
commit 89f1362e221d8f467f93deb955fdf5861a4dc1ae
26 changes: 24 additions & 2 deletions compose/material3/material3/api/desktop/material3.api
View file
Original file line number Diff line number Diff line change
@@ -731,11 +731,14 @@ public abstract interface annotation class androidx/compose/material3/Experiment

public abstract class androidx/compose/material3/ExposedDropdownMenuBoxScope {
public static final field $stable I
public fun <init> ()V
public final synthetic fun ExposedDropdownMenu (ZLkotlin/jvm/functions/Function0;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/ScrollState;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
public final fun ExposedDropdownMenu-kbRbctU (ZLkotlin/jvm/functions/Function0;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/ScrollState;ZZLandroidx/compose/ui/graphics/Shape;JFFLandroidx/compose/foundation/BorderStroke;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;III)V
public final fun ExposedDropdownMenu-vNxi1II (ZLkotlin/jvm/functions/Function0;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/ScrollState;ZLandroidx/compose/ui/graphics/Shape;JFFLandroidx/compose/foundation/BorderStroke;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;III)V
public abstract fun exposedDropdownSize (Landroidx/compose/ui/Modifier;Z)Landroidx/compose/ui/Modifier;
public static synthetic fun exposedDropdownSize$default (Landroidx/compose/material3/ExposedDropdownMenuBoxScope;Landroidx/compose/ui/Modifier;ZILjava/lang/Object;)Landroidx/compose/ui/Modifier;
public abstract fun menuAnchor (Landroidx/compose/ui/Modifier;)Landroidx/compose/ui/Modifier;
public final fun menuAnchor (Landroidx/compose/ui/Modifier;)Landroidx/compose/ui/Modifier;
public abstract fun menuAnchor-fsE2BvY (Landroidx/compose/ui/Modifier;Ljava/lang/String;Z)Landroidx/compose/ui/Modifier;
public static synthetic fun menuAnchor-fsE2BvY$default (Landroidx/compose/material3/ExposedDropdownMenuBoxScope;Landroidx/compose/ui/Modifier;Ljava/lang/String;ZILjava/lang/Object;)Landroidx/compose/ui/Modifier;
}

public final class androidx/compose/material3/ExposedDropdownMenuDefaults {
@@ -954,6 +957,25 @@ public final class androidx/compose/material3/MaterialThemeKt {
public static final fun MaterialTheme (Landroidx/compose/material3/ColorScheme;Landroidx/compose/material3/Shapes;Landroidx/compose/material3/Typography;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V
}

public final class androidx/compose/material3/MenuAnchorType {
public static final field Companion Landroidx/compose/material3/MenuAnchorType$Companion;
public static final synthetic fun box-impl (Ljava/lang/String;)Landroidx/compose/material3/MenuAnchorType;
public fun equals (Ljava/lang/Object;)Z
public static fun equals-impl (Ljava/lang/String;Ljava/lang/Object;)Z
public static final fun equals-impl0 (Ljava/lang/String;Ljava/lang/String;)Z
public fun hashCode ()I
public static fun hashCode-impl (Ljava/lang/String;)I
public fun toString ()Ljava/lang/String;
public static fun toString-impl (Ljava/lang/String;)Ljava/lang/String;
public final synthetic fun unbox-impl ()Ljava/lang/String;
}

public final class androidx/compose/material3/MenuAnchorType$Companion {
public final fun getPrimaryEditable-Mg6Rgbw ()Ljava/lang/String;
public final fun getPrimaryNotEditable-Mg6Rgbw ()Ljava/lang/String;
public final fun getSecondaryEditable-Mg6Rgbw ()Ljava/lang/String;
}

public final class androidx/compose/material3/MenuDefaults {
public static final field $stable I
public static final field INSTANCE Landroidx/compose/material3/MenuDefaults;