Using Material Design with DialogService View results in the dialog being clipped

[MartinRobins]

Prism.DryIoc.Forms 8.1.97
Xamarin.Forms 5.0.0.2578
Xamarin.Forms.Visual.Material 5.0.0.2578

If I enable Visual="Material" in the view being used as a dialog, the content of that dialog is then clipped when displayed...

If I user Visual="Default" (or omit the Visual= altogether) the content is displayed as expected...

Is there a simple (or not) way to overcome this? I have tried Padding and Margin on the outer elements, but it seems to make no difference. The Xaml is as follows...

<?xml version="1.0" encoding="UTF-8"?>
<ContentView x:Class="Views.AddGoodsInDialogView"
             xmlns="http://xamarin.com/schemas/2014/forms"
             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
             BackgroundColor="White"
             Padding="20"
             Visual="Material">

    <Grid>

        <Grid.RowDefinitions>
            <RowDefinition Height="auto" />
            <RowDefinition Height="*" />
            <RowDefinition Height="auto" />
        </Grid.RowDefinitions>

        <BoxView BackgroundColor="Black" />
        <Label Style="{DynamicResource TitleStyle}"
               Text="(4a) Add Item..."
               TextColor="White" />

        <StackLayout Grid.Row="1">

            <StackLayout.Resources>
                <Style TargetType="{x:Type Entry}">
                    <Style.Setters>
                        <Setter Property="HorizontalTextAlignment"
                                Value="Center" />
                    </Style.Setters>
                </Style>
            </StackLayout.Resources>

            <Entry Grid.Column="2"
                   Grid.ColumnSpan="2"
                   Placeholder="Product Code"
                   Text="Product Code" />

            <Label Text="Product Name" />

            <Label LineBreakMode="WordWrap"
                   Text="Product Description" />

            <Label Text="SIT" />

            <Entry Placeholder="Units"
                   Text="2500" />

            <Entry Placeholder="Location"
                   Text="Location Code" />

        </StackLayout>

        <StackLayout Grid.Row="2"
                     Orientation="Horizontal"
                     VerticalOptions="EndAndExpand">

            <Button HorizontalOptions="CenterAndExpand"
                    Text="Confirm" />

            <Button HorizontalOptions="CenterAndExpand"
                    Text="Confirm + Print Label" />

        </StackLayout>

    </Grid>
</ContentView>

TIA.

[MartinRobins]

Not saying this is the right answer, but it seems to have worked for me...

I have moved to using a Frame as the root element, and have added the following attributes...

       prism:DialogLayout.RelativeWidthRequest="1"
       prism:DialogLayout.RelativeHeightRequest="1"

It is no longer clipping on the top/left, and by slightly modifying the content I have stopped it clipping on the right/bottom.

Would still like to know however if there is a right way to resolve this.