Restore dbox behavior from ftxui5.0.0

Bug:https://github.com/eclipse-ecal/ecal/pull/2095

.bcr/presubmit.yml

@@ -1,6 +1,3 @@
-# Copyright 2025 Arthur Sonzogni. All rights reserved.
-# Use of this source code is governed by the MIT license that can be found in
-# the LICENSE file.
 matrix:
   platform:
   - centos7

.github/workflows/publish.yaml

@@ -1,33 +1,24 @@
 name: "Publish to Bazel Central Registry"
 
 on:
-  # On manual trigger:
+  # Manual kick-off (you type the tag)
   workflow_dispatch:
     inputs:
       tag_name:
+        description: "Tag to publish"
         required: true
         type: string
 
-  # Called from the release workflow:
-  workflow_call:
-    inputs:
-      tag_name:
-        required: true
-        type: string
-    secrets:
-      PUBLISH_TOKEN:
-        required: true
-        type: string
+permissions:
+  contents:     write
 
-jobs:    
+jobs:
   publish:
     uses: bazel-contrib/publish-to-bcr/.github/workflows/publish.yaml@v0.0.4
     with:
-      tag_name: ${{ inputs.tag_name }}
+      tag_name: ${{ github.event.inputs.tag_name }}
       registry_fork: ArthurSonzogni/bazel-central-registry
-    permissions:
-      attestations: write
-      contents: write
-      id-token: write
+      attest: false
+
     secrets:
       publish_token: ${{ secrets.PUBLISH_TOKEN }}

.github/workflows/release.yaml

@@ -13,6 +13,8 @@ permissions:
   # Needed to mint attestations
   id-token: write
   attestations: write
+  # Needed to upload release assets
+  contents: write
 
 jobs:
   release:
@@ -90,39 +92,9 @@ jobs:
         run: >
           git archive --format=tar.gz -o source.tar.gz HEAD
 
-      - name: Generate source attestation
-        id: attest_source
-        uses: actions/attest-build-provenance@v2
-        with:
-          subject-path: source.tar.gz
-
-      - name: Write source.intoto.jsonl
-        run: 
-          jq --compact-output < "${{ steps.attest_source.outputs.bundle-path }}" \
-            > source.tar.gz.intoto.jsonl
-
       - name: "Upload source package"
         uses: shogo82148/actions-upload-release-asset@v1
         with:
           upload_url: ${{ needs.release.outputs.upload_url }}
           asset_path: source.tar.gz
           overwrite: true
-
-      - name: "Upload source attestation"
-        uses: shogo82148/actions-upload-release-asset@v1
-        with:
-          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: source.tar.gz.intoto.jsonl
-          overwrite: true
-
-  # Publish to Bazel Central Registry.
-  # This call the .github/workflows/publish.yaml workflow.
-  publish_to_bazel_central_registry:
-    name: "Publish to Bazel Central Registry"
-    needs: package_source
-    uses: ./.github/workflows/publish.yaml
-    with:
-      tag_name: ${{ github.ref }}
-    secrets:
-      PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
-

CHANGELOG.md

@@ -4,7 +4,11 @@ Changelog
 Future release
 ------------
 
-6.1.2 (2025-05-01)
+### dom
+- Bugfix: Restore the `dbox` behavior from ftxui 5.0.0. To apply bgcolor
+  blending between the two layers, a new `dboxBlend` will be added.
+
+6.1.8 (2025-05-01)
 ------------------
 
 ### Build
@@ -15,7 +19,7 @@ Future release
 
   **MODULE.bazel**
   ```bazel
-  bazel_dep(name = "ftxui", version = "6.1.2")
+  bazel_dep(name = "ftxui", version = "6.1.8")
   ```
 
   **BUILD.bazel**

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12)
 
 project(ftxui
   LANGUAGES CXX
-  VERSION 6.1.2
+  VERSION 6.1.8
   DESCRIPTION "C++ Functional Terminal User Interface."
 )
 

MODULE.bazel

@@ -1,9 +1,5 @@
-# Copyright 2025 Arthur Sonzogni. All rights reserved.
-# Use of this source code is governed by the MIT license that can be found in
-# the LICENSE file.
-
 # FTXUI Module.
-module(name = "ftxui", version = "6.1.2")
+module(name = "ftxui", version = "6.1.8", compatibility_level = 6)
 
 # Build deps.
 bazel_dep(name = "rules_cc", version = "0.1.1")

README.md

@@ -372,7 +372,7 @@ include(FetchContent)
 
 FetchContent_Declare(ftxui
   GIT_REPOSITORY https://github.com/ArthurSonzogni/ftxui
-  GIT_TAG v6.1.2
+  GIT_TAG v6.1.8
 )
 
 FetchContent_GetProperties(ftxui)

src/ftxui/dom/dbox.cpp

@@ -45,59 +45,6 @@ class DBox : public Node {
       child->SetBox(box);
     }
   }
-
-  void Render(Screen& screen) override {
-    if (children_.size() <= 1) {
-      Node::Render(screen);
-      return;
-    }
-
-    const int width = box_.x_max - box_.x_min + 1;
-    const int height = box_.y_max - box_.y_min + 1;
-    std::vector<Pixel> pixels(std::size_t(width * height));
-
-    for (auto& child : children_) {
-      child->Render(screen);
-
-      // Accumulate the pixels
-      Pixel* acc = pixels.data();
-      for (int x = 0; x < width; ++x) {
-        for (int y = 0; y < height; ++y) {
-          auto& pixel = screen.PixelAt(x + box_.x_min, y + box_.y_min);
-          acc->background_color =
-              Color::Blend(acc->background_color, pixel.background_color);
-          acc->automerge = pixel.automerge || acc->automerge;
-          if (pixel.character.empty()) {
-            acc->foreground_color =
-                Color::Blend(acc->foreground_color, pixel.background_color);
-          } else {
-            acc->blink = pixel.blink;
-            acc->bold = pixel.bold;
-            acc->dim = pixel.dim;
-            acc->inverted = pixel.inverted;
-            acc->italic = pixel.italic;
-            acc->underlined = pixel.underlined;
-            acc->underlined_double = pixel.underlined_double;
-            acc->strikethrough = pixel.strikethrough;
-            acc->hyperlink = pixel.hyperlink;
-            acc->character = pixel.character;
-            acc->foreground_color = pixel.foreground_color;
-          }
-          ++acc;  // NOLINT
-
-          pixel = Pixel();
-        }
-      }
-    }
-
-    // Render the accumulated pixels:
-    Pixel* acc = pixels.data();
-    for (int x = 0; x < width; ++x) {
-      for (int y = 0; y < height; ++y) {
-        screen.PixelAt(x + box_.x_min, y + box_.y_min) = *acc++;  // NOLINT
-      }
-    }
-  }
 };
 }  // namespace