@legendapp/spark 0.0.1-next.2 → 0.0.1-next.4

package/vendor/node_modules/@legendapp/spark-tray/windows/SparkTray/SparkTray.h

@@ -2,6 +2,9 @@
 #include "NativeModules.h"
 #include <shellapi.h>
 #include <windowsx.h>
+#include <wincodec.h>
+#pragma comment(lib, "Windowscodecs.lib")
+#pragma comment(lib, "Ole32.lib")
 #include <map>
 #include <memory>
 #include <vector>
@@ -12,7 +15,7 @@ namespace winrt::SparkTray {
 namespace React = Microsoft::ReactNative;
 namespace Json = Windows::Data::Json;
 struct TrayState : std::enable_shared_from_this<TrayState> {
-  struct Item { std::string id; Json::JsonObject options; HICON icon = nullptr; };
+  struct Item { std::string id, instanceId; Json::JsonObject options; HICON icon = nullptr; };
   HWND hwnd = nullptr; UINT sequence = 0, taskbarCreated = RegisterWindowMessageW(L"TaskbarCreated");
   React::ReactContext context;
   std::map<UINT, Item> items;
@@ -29,6 +32,24 @@ struct TrayState : std::enable_shared_from_this<TrayState> {
     if (operation == NIM_ADD) { data.uVersion = NOTIFYICON_VERSION_4; Shell_NotifyIconW(NIM_SETVERSION, &data); }
   }
   static HICON Icon(Json::JsonObject const &options) {
+    const auto imagePath = options.GetNamedString(L"imagePath", L"");
+    if (!imagePath.empty()) {
+      com_ptr<IWICImagingFactory> factory; check_hresult(CoCreateInstance(CLSID_WICImagingFactory, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(factory.put())));
+      com_ptr<IWICBitmapDecoder> decoder; check_hresult(factory->CreateDecoderFromFilename(imagePath.c_str(), nullptr, GENERIC_READ, WICDecodeMetadataCacheOnLoad, decoder.put()));
+      com_ptr<IWICBitmapFrameDecode> frame; check_hresult(decoder->GetFrame(0, frame.put()));
+      const UINT width = GetSystemMetrics(SM_CXSMICON), height = GetSystemMetrics(SM_CYSMICON);
+      com_ptr<IWICBitmapScaler> scaler; check_hresult(factory->CreateBitmapScaler(scaler.put())); check_hresult(scaler->Initialize(frame.get(), width, height, WICBitmapInterpolationModeFant));
+      com_ptr<IWICFormatConverter> converter; check_hresult(factory->CreateFormatConverter(converter.put()));
+      check_hresult(converter->Initialize(scaler.get(), GUID_WICPixelFormat32bppPBGRA, WICBitmapDitherTypeNone, nullptr, 0, WICBitmapPaletteTypeCustom));
+      std::vector<BYTE> pixels(width * height * 4); check_hresult(converter->CopyPixels(nullptr, width * 4, static_cast<UINT>(pixels.size()), pixels.data()));
+      BITMAPINFO info{}; info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info.bmiHeader.biWidth = width; info.bmiHeader.biHeight = -static_cast<LONG>(height); info.bmiHeader.biPlanes = 1; info.bmiHeader.biBitCount = 32; info.bmiHeader.biCompression = BI_RGB;
+      void *bits = nullptr; auto color = CreateDIBSection(nullptr, &info, DIB_RGB_COLORS, &bits, nullptr, 0); if (!color) throw_last_error();
+      memcpy(bits, pixels.data(), pixels.size()); std::vector<BYTE> maskBits(((width + 15) / 16) * 2 * height, 0);
+      auto mask = CreateBitmap(width, height, 1, 1, maskBits.data()); if (!mask) { DeleteObject(color); throw_last_error(); }
+      ICONINFO iconInfo{}; iconInfo.fIcon = TRUE; iconInfo.hbmColor = color; iconInfo.hbmMask = mask;
+      auto icon = CreateIconIndirect(&iconInfo); const auto error = GetLastError(); DeleteObject(color); DeleteObject(mask);
+      if (!icon) throw hresult_error(HRESULT_FROM_WIN32(error)); return icon;
+    }
     // Windows has no SF Symbols or tray text label. Its app icon identifies the
     // item; title supplies its accessible tooltip when no tooltip is specified.
     HICON large = nullptr, small = nullptr; wchar_t executable[32768]{};
@@ -62,16 +83,16 @@ struct TrayState : std::enable_shared_from_this<TrayState> {
   void Select(UINT key, UINT event, LPARAM position) {
     auto keepAlive = shared_from_this();
     auto found = items.find(key); if (found == items.end()) return;
-    const auto id = found->second.id;
+    const auto id = found->second.id, instanceId = found->second.instanceId;
     auto entries = found->second.options.GetNamedArray(L"menu", Json::JsonArray());
     if (event != NIN_SELECT && event != NIN_KEYSELECT && event != WM_CONTEXTMENU) return;
-    if (entries.Size() == 0) { context.EmitJSEvent(L"RCTDeviceEventEmitter", L"desktop", React::JSValueObject{{"type", "trayClick"}, {"trayId", id}}); return; }
+    if (entries.Size() == 0) { context.EmitJSEvent(L"RCTDeviceEventEmitter", L"desktop", React::JSValueObject{{"type", "trayClick"}, {"trayId", id}, {"instanceId", instanceId}}); return; }
     std::map<UINT, std::string> actions; UINT command = 0; auto menu = Menu(entries, actions, command);
     POINT point{GET_X_LPARAM(position), GET_Y_LPARAM(position)}; if (point.x == -1 && point.y == -1) GetCursorPos(&point);
     SetForegroundWindow(hwnd);
     auto selected = TrackPopupMenuEx(menu, TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTBUTTON, point.x, point.y, hwnd, nullptr);
     DestroyMenu(menu); if (hwnd) PostMessageW(hwnd, WM_NULL, 0, 0);
-    if (actions.count(selected) && items.count(key)) context.EmitJSEvent(L"RCTDeviceEventEmitter", L"desktop", React::JSValueObject{{"type", "trayAction"}, {"trayId", id}, {"itemId", actions.at(selected)}});
+    if (actions.count(selected) && items.count(key)) context.EmitJSEvent(L"RCTDeviceEventEmitter", L"desktop", React::JSValueObject{{"type", "trayAction"}, {"trayId", id}, {"instanceId", instanceId}, {"itemId", actions.at(selected)}});
   }
   static LRESULT CALLBACK Proc(HWND hwnd, UINT message, WPARAM w, LPARAM l) noexcept {
     auto self = reinterpret_cast<TrayState *>(GetWindowLongPtrW(hwnd, GWLP_USERDATA));
@@ -89,12 +110,12 @@ struct TrayState : std::enable_shared_from_this<TrayState> {
     hwnd = CreateWindowExW(WS_EX_TOOLWINDOW, cls.lpszClassName, L"", WS_POPUP, 0, 0, 0, 0, nullptr, nullptr, cls.hInstance, nullptr);
     if (!hwnd) throw_last_error(); SetWindowLongPtrW(hwnd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
   }
-  void Remove(UINT key) noexcept {
+  void Remove(UINT key, bool strict = true) {
     auto found = items.find(key); if (found == items.end()) return;
-    NOTIFYICONDATAW data{}; data.cbSize = sizeof(data); data.hWnd = hwnd; data.uID = key; Shell_NotifyIconW(NIM_DELETE, &data);
+    NOTIFYICONDATAW data{}; data.cbSize = sizeof(data); data.hWnd = hwnd; data.uID = key; if (!Shell_NotifyIconW(NIM_DELETE, &data) && strict) throw hresult_error(E_FAIL, L"Windows could not remove the tray icon");
     DestroyIcon(found->second.icon); items.erase(found);
   }
-  void Close() noexcept { while (!items.empty()) Remove(items.begin()->first); if (hwnd) { DestroyWindow(hwnd); hwnd = nullptr; } }
+  void Close() noexcept { while (!items.empty()) Remove(items.begin()->first, false); if (hwnd) { DestroyWindow(hwnd); hwnd = nullptr; } }
 };
 REACT_MODULE(SparkTray, L"NativeDesktopTray")
 struct SparkTray {
@@ -108,21 +129,30 @@ struct SparkTray {
       try {
         auto args = Json::JsonObject::Parse(to_hstring(encoded)); auto id = to_string(args.GetNamedString(L"id")); current->EnsureWindow();
         UINT key = 0; for (auto const &[number, item] : current->items) if (item.id == id) { key = number; break; }
+        const auto instanceId = to_string(args.GetNamedString(L"instanceId"));
+        if (key && current->items.at(key).instanceId != instanceId) {
+          if (method == "remove") promise.Resolve("null");
+          else promise.Reject(React::ReactError{method == "create" ? "E_ALREADY_EXISTS" : "E_NOT_FOUND", "Tray belongs to a different instance"});
+          return;
+        }
         if (method == "remove") current->Remove(key);
         else if (method == "create" || method == "update") {
-          if (method == "create" && key) { promise.Reject(React::ReactError{"E_TRAY_EXISTS", "Tray id already exists"}); return; }
+          if (method == "create" && key) { promise.Reject(React::ReactError{"E_ALREADY_EXISTS", "Tray id already exists"}); return; }
           if (method == "update" && !key) { promise.Reject(React::ReactError{"E_NOT_FOUND", "Tray was removed"}); return; }
-          Json::JsonObject options = key ? Json::JsonObject::Parse(current->items.at(key).options.Stringify()) : Json::JsonObject();
+          const bool creating = key == 0;
+          Json::JsonObject options;
+          if (!creating) for (auto const &entry : current->items.at(key).options) options.SetNamedValue(entry.Key(), entry.Value());
           for (auto const &entry : args) options.SetNamedValue(entry.Key(), entry.Value());
-          if (options.GetNamedString(L"title", L"").empty() && options.GetNamedString(L"symbol", L"").empty()) throw hresult_invalid_argument(L"Tray needs a title or symbol");
+          if (options.GetNamedString(L"title", L"").empty() && options.GetNamedString(L"symbol", L"").empty() && options.GetNamedString(L"imagePath", L"").empty()) throw hresult_invalid_argument(L"Tray needs a title or symbol");
           // Validate menus before replacing a live icon.
-          std::map<UINT, std::string> actions; UINT command = 0; auto menu = TrayState::Menu(options.GetNamedArray(L"menu", Json::JsonArray()), actions, command); DestroyMenu(menu);
-          auto icon = TrayState::Icon(options); const bool creating = key == 0;
+          if (creating || args.HasKey(L"menu")) { std::map<UINT, std::string> actions; UINT command = 0; auto menu = TrayState::Menu(options.GetNamedArray(L"menu", Json::JsonArray()), actions, command); DestroyMenu(menu); }
+          const bool iconChanged = creating || args.HasKey(L"imagePath");
+          auto icon = iconChanged ? TrayState::Icon(options) : current->items.at(key).icon;
           if (creating) { for (UINT i = 0; i < 65535; ++i) { auto candidate = current->sequence = current->sequence % 65535 + 1; if (!current->items.count(candidate)) { key = candidate; break; } } }
           if (!key) { DestroyIcon(icon); throw hresult_error(E_FAIL, L"Too many tray items"); }
-          TrayState::Item item{id, options, icon};
-          try { current->Publish(key, item, creating ? NIM_ADD : NIM_MODIFY); } catch (...) { DestroyIcon(icon); throw; }
-          if (!creating) DestroyIcon(current->items.at(key).icon);
+          TrayState::Item item{id, instanceId, options, icon};
+          try { current->Publish(key, item, creating ? NIM_ADD : NIM_MODIFY); } catch (...) { if (iconChanged) DestroyIcon(icon); throw; }
+          if (!creating && iconChanged) DestroyIcon(current->items.at(key).icon);
           current->items.insert_or_assign(key, std::move(item));
         } else throw hresult_invalid_argument(L"Unknown tray operation");
         promise.Resolve("null");

package/vendor/node_modules/@legendapp/spark-ui/macos/RNSparkButton.mm

@@ -30,6 +30,7 @@ using namespace facebook::react;
   _button.title = [NSString stringWithUTF8String:value.title.c_str()];
   _button.enabled = !value.disabled;
   _button.bordered = value.variant != SparkButtonVariant::Borderless;
+  _button.accessibilityLabel = [NSString stringWithUTF8String:value.accessibilityLabel.c_str()];
   _button.accessibilityIdentifier = [NSString stringWithUTF8String:value.testId.c_str()];
   [super updateProps:props oldProps:oldProps];
 }
@@ -43,7 +44,7 @@ using namespace facebook::react;
   _button.title = @"";
   _button.enabled = YES;
   _button.bordered = YES;
-  _button.accessibilityIdentifier = nil;
+  _button.accessibilityIdentifier = nil; _button.accessibilityLabel = nil;
   _button.highlighted = NO;
   if (self.window.firstResponder == _button) [self.window makeFirstResponder:nil];
 }

package/vendor/node_modules/@legendapp/spark-ui/macos/RNSparkTextInput.mm

@@ -6,6 +6,7 @@ using namespace facebook::react;
 @implementation RNSparkTextInput {
   NSTextField *_field;
   BOOL _initialized;
+  int _eventCount;
 }
 - (instancetype)init {
   if (self = [super init]) {
@@ -22,12 +23,19 @@ using namespace facebook::react;
 }
 - (BOOL)isFlipped { return YES; }
 - (void)controlTextDidChange:(NSNotification *)notification {
+  if (!_field.enabled) return;
+  ++_eventCount;
   const auto emitter = std::static_pointer_cast<const SparkTextInputEventEmitter>(_eventEmitter);
-  if (emitter) emitter->onTextChange({ .text = _field.stringValue.UTF8String ?: "" });
+  if (emitter) emitter->onTextChange({ .text = _field.stringValue.UTF8String ?: "", .eventCount = _eventCount });
 }
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps {
   const auto &value = *std::static_pointer_cast<const SparkTextInputProps>(props);
   if (!_initialized) { _field.stringValue = [NSString stringWithUTF8String:value.defaultText.c_str()]; _initialized = YES; }
+  if (value.controlled && value.eventCount >= _eventCount) {
+    NSString *text = [NSString stringWithUTF8String:value.text.c_str()];
+    if (![_field.stringValue isEqualToString:text]) _field.stringValue = text;
+  }
+  _field.enabled = !value.disabled;
   _field.accessibilityIdentifier = [NSString stringWithUTF8String:value.testId.c_str()];
   _field.accessibilityLabel = [NSString stringWithUTF8String:value.accessibilityLabel.c_str()];
   [super updateProps:props oldProps:oldProps];
@@ -39,7 +47,7 @@ using namespace facebook::react;
 - (void)prepareForRecycle {
   [_field abortEditing];
   [super prepareForRecycle];
-  _initialized = NO; _field.stringValue = @""; _field.accessibilityIdentifier = nil; _field.accessibilityLabel = nil;
+  _initialized = NO; _eventCount = 0; _field.enabled = YES; _field.stringValue = @""; _field.accessibilityIdentifier = nil; _field.accessibilityLabel = nil;
 }
 + (ComponentDescriptorProvider)componentDescriptorProvider { return concreteComponentDescriptorProvider<SparkTextInputComponentDescriptor>(); }
 @end

package/vendor/node_modules/@legendapp/spark-ui/macos/appkit-split-view/RNSidebarSplitViewComponent.h

@@ -0,0 +1,15 @@
+#import <React/RCTViewComponentView.h>
+#import <TargetConditionals.h>
+
+#if TARGET_OS_OSX
+#import <AppKit/AppKit.h>
+#else
+#import <UIKit/UIKit.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNSidebarSplitViewComponent : RCTViewComponentView
+@end
+
+NS_ASSUME_NONNULL_END