Skip to content

Commit 44f05ed

Browse files
Fix for #121 / version bump
1 parent 2c5eaba commit 44f05ed

4 files changed

Lines changed: 19 additions & 4 deletions

File tree

BlazorContextMenu/BlazorContextMenu.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<Copyright />
1717
<PackageTags>blazor blazor-component blazor-context-menu context-menu contextmenu menu blazor-menu blazorcontextmenu razor razor-components razorcomponents</PackageTags>
1818
<VersionSuffix>$(VersionSuffix)</VersionSuffix>
19-
<Version>1.13.0</Version>
19+
<Version>1.14.0</Version>
2020
<Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
2121
<Product>Blazor.ContextMenu</Product>
2222
</PropertyGroup>

BlazorContextMenu/Components/SubMenu.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@inherits ContextMenuBase
22
@namespace BlazorContextMenu
33

4-
<div @attributes="@Attributes" class="@($"{BaseClass} {ClassCalc} {DisplayClassCalc}")" id="@Id" style="@($"left:{X}px;top:{Y}px;")" data-autohide="@AutoHide.ToString().ToLower()">
4+
<div @attributes="@Attributes" class="@($"{BaseClass} {ClassCalc} {DisplayClassCalc}")" id="@Id" style="@($"left:{X}px;top:{Y}px;z-index:{ZIndex};")" data-autohide="@AutoHide.ToString().ToLower()">
55
@if (IsShowing)
66
{
77
<ul class="@ListClassCalc">

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,12 @@ public class Startup
244244
</details>
245245
246246
## Release Notes
247-
<details open="open"><summary>1.13</summary>
247+
<details open="open"><summary>1.14</summary>
248+
249+
>- Fix for [#121](https://github.com/stavroskasidis/BlazorContextMenu/issues/121).
250+
</details>
251+
252+
<details><summary>1.13</summary>
248253

249254
>- Fix for [#114](https://github.com/stavroskasidis/BlazorContextMenu/issues/114).
250255
</details>

TestApps/BlazorContextMenu.TestAppsCommon/CommonIndex.razor

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@
7575
<p id="test14-trigger">Right-Click me (menu6 - items contain nested components)</p>
7676
</ContextMenuTrigger>
7777

78+
<ContextMenuTrigger MenuId="menu1" MouseButtonTrigger="MouseButtonTrigger.Left">
79+
<p id="test15-trigger">Left-click me (menu1)</p>
80+
<p id="ignoreThis">Ignore this</p>
81+
</ContextMenuTrigger>
82+
83+
7884

7985
<ContextMenu Id="menu1" Template="dark" OnAppearing="OnAppearingMenu1">
8086
<Item Id="menu1-item1" OnClick="FetchDataClick">Fetch Data</Item>
@@ -219,7 +225,11 @@
219225

220226
void OnAppearingMenu1(MenuAppearingEventArgs e)
221227
{
222-
if (e.ContextMenuTrigger != null && e.ContextMenuTrigger.Id == "test9-trigger")
228+
if (e.ContextMenuTrigger != null && (e.ContextMenuTrigger.Id == "test9-trigger"))
229+
{
230+
e.PreventShow = true;
231+
}
232+
if (e.ContextMenuTargetId == "ignoreThis")
223233
{
224234
e.PreventShow = true;
225235
}

0 commit comments

Comments
 (0)