Merge pull request #5266 from matrix-org/t3chguy/feat/widgets

Pinned widgets work

Author: t3chguy

res/css/_components.scss

@@ -51,11 +51,11 @@
 @import "./views/avatars/_DecoratedRoomAvatar.scss";
 @import "./views/avatars/_MemberStatusMessageAvatar.scss";
 @import "./views/avatars/_PulsedAvatar.scss";
+@import "./views/avatars/_WidgetAvatar.scss";
 @import "./views/context_menus/_IconizedContextMenu.scss";
 @import "./views/context_menus/_MessageContextMenu.scss";
 @import "./views/context_menus/_StatusMessageContextMenu.scss";
 @import "./views/context_menus/_TagTileContextMenu.scss";
-@import "./views/context_menus/_WidgetContextMenu.scss";
 @import "./views/dialogs/_AddressPickerDialog.scss";
 @import "./views/dialogs/_Analytics.scss";
 @import "./views/dialogs/_BugReportDialog.scss";

res/css/structures/_MatrixChat.scss

@@ -79,7 +79,6 @@ limitations under the License.
     height: 100%;
 }
 
-.mx_MatrixChat > .mx_LeftPanel2:hover + .mx_ResizeHandle_horizontal,
 .mx_MatrixChat > .mx_ResizeHandle_horizontal:hover {
     position: relative;
 

src/dispatcher/payloads/AppTileActionPayload.ts renamed to res/css/views/avatars/_WidgetAvatar.scss

@@ -14,10 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { ActionPayload } from "../payloads";
-import { Action } from "../actions";
-
-export interface AppTileActionPayload extends ActionPayload {
-    action: Action.AppTileDelete | Action.AppTileRevoke;
-    widgetId: string;
+.mx_WidgetAvatar {
+    border-radius: 4px;
 }

res/css/views/context_menus/_WidgetContextMenu.scss

@@ -128,6 +128,13 @@ limitations under the License.
                 mask-size: 20px;
                 mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
             }
+
+            &.mx_AccessibleButton_disabled {
+                padding-right: 12px;
+                &::after {
+                    content: unset;
+                }
+            }
         }
     }
 

res/css/views/right_panel/_BaseCard.scss

@@ -110,28 +110,107 @@ limitations under the License.
 
     .mx_RoomSummaryCard_appsGroup {
         .mx_RoomSummaryCard_Button {
-            padding-left: 12px;
+            // this button is special so we have to override some of the original styling
+            // as we will be applying it in its children
+            padding: 0;
+            height: auto;
             color: $tertiary-fg-color;
 
-            span {
-                color: $primary-fg-color;
+            .mx_RoomSummaryCard_icon_app {
+                padding: 10px 48px 10px 12px; // based on typical mx_RoomSummaryCard_Button padding
+                text-overflow: ellipsis;
+                overflow: hidden;
+
+                .mx_BaseAvatar_image {
+                    vertical-align: top;
+                    margin-right: 12px;
+                }
+
+                span {
+                    color: $primary-fg-color;
+                }
+            }
+
+            .mx_RoomSummaryCard_app_pinToggle,
+            .mx_RoomSummaryCard_app_options {
+                position: absolute;
+                top: 0;
+                height: 100%; // to give bigger interactive zone
+                width: 24px;
+                padding: 12px 4px;
+                box-sizing: border-box;
+                min-width: 24px; // prevent flexbox crushing
+
+                &:hover {
+                    &::after {
+                        content: '';
+                        position: absolute;
+                        height: 24px;
+                        width: 24px;
+                        top: 8px; // equal to padding-top of parent
+                        left: 0;
+                        border-radius: 12px;
+                        background-color: rgba(141, 151, 165, 0.1);
+                    }
+                }
+
+                &::before {
+                    content: '';
+                    position: absolute;
+                    height: 16px;
+                    width: 16px;
+                    mask-repeat: no-repeat;
+                    mask-position: center;
+                    mask-size: 16px;
+                    background-color: $icon-button-color;
+                }
+            }
+
+            .mx_RoomSummaryCard_app_pinToggle {
+                right: 24px;
+
+                &::before {
+                    mask-image: url('$(res)/img/element-icons/room/pin-upright.svg');
+                }
+            }
+
+            .mx_RoomSummaryCard_app_options {
+                right: 48px;
+                display: none;
+
+                &::before {
+                    mask-image: url('$(res)/img/element-icons/room/ellipsis.svg');
+                }
+            }
+
+            &.mx_RoomSummaryCard_Button_pinned {
+                &::after {
+                    opacity: 0.2;
+                }
+
+                .mx_RoomSummaryCard_app_pinToggle::before {
+                    background-color: $accent-color;
+                }
             }
 
-            img {
-                vertical-align: top;
-                margin-right: 12px;
-                border-radius: 4px;
+            &:hover {
+                .mx_RoomSummaryCard_icon_app {
+                    padding-right: 72px;
+                }
+
+                .mx_RoomSummaryCard_app_options {
+                    display: unset;
+                }
             }
 
             &::before {
                 content: unset;
             }
-        }
 
-        .mx_RoomSummaryCard_icon_app_pinned::after {
-            mask-image: url('$(res)/img/element-icons/room/pin-upright.svg');
-            background-color: $accent-color;
-            transform: unset;
+            &::after {
+                top: 8px; // re-align based on the height change
+                pointer-events: none; // pass through to the real button
+            }
         }
     }
 

res/css/views/right_panel/_RoomSummaryCard.scss

@@ -24,34 +24,35 @@ limitations under the License.
         border: 0;
     }
 
-    &.mx_WidgetCard_noEdit {
-        .mx_AccessibleButton_kind_secondary {
-            margin: 0 12px;
+    .mx_BaseCard_header {
+        display: inline-flex;
 
-            &:first-child {
-                // expand the Pin to room primary action
-                flex-grow: 1;
-            }
+        & > h2 {
+            margin-right: 0;
+            flex-grow: 1;
         }
-    }
-
-    .mx_WidgetCard_optionsButton {
-        position: relative;
-        height: 18px;
-        width: 26px;
 
-        &::before {
-            content: "";
-            position: absolute;
-            width: 20px;
+        .mx_WidgetCard_optionsButton {
+            position: relative;
+            margin-right: 44px;
             height: 20px;
-            top: 6px;
-            left: 20px;
-            mask-repeat: no-repeat;
-            mask-position: center;
-            mask-size: contain;
-            mask-image: url('$(res)/img/element-icons/room/ellipsis.svg');
-            background-color: $secondary-fg-color;
+            width: 20px;
+            min-width: 20px; // prevent crushing by the flexbox
+            padding: 0;
+
+            &::before {
+                content: "";
+                position: absolute;
+                width: 20px;
+                height: 20px;
+                top: 0;
+                left: 4px;
+                mask-repeat: no-repeat;
+                mask-position: center;
+                mask-size: contain;
+                mask-image: url('$(res)/img/element-icons/room/ellipsis.svg');
+                background-color: $secondary-fg-color;
+            }
         }
     }
 }